4412310981

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/google/OpenSK/commit/<a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/c4e6aa9fe4736470450307eb8cf6727eb4356da9">c4e6aa9fe">&lt;a href=&quot;https://github.com/google/OpenSK/commit/</a><a class="double-link" href="https://github.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/c4e6aa9fe4736470450307eb8cf6727eb4356da9">c4e6aa9fe</a><a href="https://github.com/google/OpenSK/commit/c4e6aa9fe4736470450307eb8cf6727eb4356da9">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/google/OpenSK/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/c4e6aa9fe4736470450307eb8cf6727eb4356da9&quot;&gt;c4e6aa9fe&lt;/a&gt;&lt;a href=&quot;https://github.com/google/OpenSK/commit/c4e6aa9fe4736470450307eb8cf6727eb4356da9&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/google/OpenSK/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/google/OpenSK/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;htt... (continued)

Pull Request Pull Request #605: CTAP HID Lock

Run Details

217 of 217 new or added lines in 4 files covered. (100.0%)

12962 of 13511 relevant lines covered (95.94%)

3025.39 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

2.04

/libraries/opensk/src/lib.rs

// Copyright 2019-2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#![cfg_attr(not(feature = "std"), no_std)]

extern crate alloc;
#[macro_use]
extern crate arrayref;

use crate::ctap::hid::{HidPacket, HidPacketIterator};
use crate::ctap::main_hid::MainHid;
#[cfg(feature = "vendor_hid")]
use crate::ctap::vendor_hid::VendorHid;
use crate::ctap::CtapState;
pub use crate::ctap::Transport;
use crate::env::Env;

// Those macros should eventually be split into trace, debug, info, warn, and error macros when
// adding either the defmt or log feature and crate dependency.
#[cfg(feature = "debug_ctap")]
macro_rules! debug_ctap {
    ($env: expr, $($rest:tt)*) => {{
        use core::fmt::Write;
        writeln!($env.write(), $($rest)*).unwrap();
    }};
}
#[cfg(not(feature = "debug_ctap"))]
macro_rules! debug_ctap {
    ($env: expr, $($rest:tt)*) => {
        // To avoid unused variable warnings.
        let _ = $env;
    };
}

pub mod api;
// TODO(kaczmarczyck): Refactor this so that ctap module isn't public.
pub mod ctap;
pub mod env;
#[cfg(feature = "std")]
pub mod test_helpers;

/// CTAP implementation parameterized by its environment.
pub struct Ctap<E: Env> {
    env: E,
    state: CtapState<E>,
    hid: MainHid<E>,
    #[cfg(feature = "vendor_hid")]
    vendor_hid: VendorHid<E>,
}

impl<E: Env> Ctap<E> {
    /// Instantiates a CTAP implementation given its environment.
    // This should only take the environment, but it temporarily takes the boot time until the
    // clock is part of the environment.
    pub fn new(mut env: E) -> Self {
        let state = CtapState::<E>::new(&mut env);
        let hid = MainHid::default();
        #[cfg(feature = "vendor_hid")]
        let vendor_hid = VendorHid::default();
        Ctap {
            env,
            state,
            hid,
            #[cfg(feature = "vendor_hid")]
            vendor_hid,
        }
    }

    pub fn state(&mut self) -> &mut CtapState<E> {
        &mut self.state
    }

    pub fn hid(&mut self) -> &mut MainHid<E> {
        &mut self.hid
    }

    pub fn env(&mut self) -> &mut E {
        &mut self.env
    }

    pub fn process_hid_packet(
        &mut self,
        packet: &HidPacket,
        transport: Transport,
    ) -> HidPacketIterator {
        match transport {
            Transport::MainHid => {
                #[cfg(not(feature = "vendor_hid"))]
                let is_disabled = false;
                #[cfg(feature = "vendor_hid")]
                let is_disabled = self.vendor_hid.has_channel_lock(&mut self.env);
                self.hid
                    .process_hid_packet(&mut self.env, packet, is_disabled, &mut self.state)
            }
            #[cfg(feature = "vendor_hid")]
            Transport::VendorHid => {
                let is_disabled = self.hid.has_channel_lock(&mut self.env);
                self.vendor_hid.process_hid_packet(
                    &mut self.env,
                    packet,
                    is_disabled,
                    &mut self.state,
                )
            }
        }
    }

    pub fn should_wink(&mut self) -> bool {
        self.hid.should_wink(&mut self.env)
    }

    #[cfg(feature = "with_ctap1")]
    pub fn u2f_grant_user_presence(&mut self) {
        self.state.u2f_grant_user_presence(&mut self.env)
    }

    #[cfg(feature = "with_ctap1")]
    pub fn u2f_needs_user_presence(&mut self) -> bool {
        self.state.u2f_needs_user_presence(&mut self.env)
    }
}

1	// Copyright 2019-2022 Google LLC	1✔
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	#![cfg_attr(not(feature = "std"), no_std)]
16
17	extern crate alloc;
18	#[macro_use]
19	extern crate arrayref;
20
21	use crate::ctap::hid::{HidPacket, HidPacketIterator};
22	use crate::ctap::main_hid::MainHid;
23	#[cfg(feature = "vendor_hid")]
24	use crate::ctap::vendor_hid::VendorHid;
25	use crate::ctap::CtapState;
26	pub use crate::ctap::Transport;
27	use crate::env::Env;
28
29	// Those macros should eventually be split into trace, debug, info, warn, and error macros when
30	// adding either the defmt or log feature and crate dependency.
31	#[cfg(feature = "debug_ctap")]
32	macro_rules! debug_ctap {
33	($env: expr, $($rest:tt)*) => {{
34	use core::fmt::Write;
35	writeln!($env.write(), $($rest)*).unwrap();
36	}};
37	}
38	#[cfg(not(feature = "debug_ctap"))]
39	macro_rules! debug_ctap {
40	($env: expr, $($rest:tt)*) => {
41	// To avoid unused variable warnings.
42	let _ = $env;
43	};
44	}
45
46	pub mod api;
47	// TODO(kaczmarczyck): Refactor this so that ctap module isn't public.
48	pub mod ctap;
49	pub mod env;
50	#[cfg(feature = "std")]
51	pub mod test_helpers;
52
53	/// CTAP implementation parameterized by its environment.
54	pub struct Ctap<E: Env> {
55	env: E,
56	state: CtapState<E>,
57	hid: MainHid<E>,
58	#[cfg(feature = "vendor_hid")]
59	vendor_hid: VendorHid<E>,
60	}
61
62	impl<E: Env> Ctap<E> {
63	/// Instantiates a CTAP implementation given its environment.
64	// This should only take the environment, but it temporarily takes the boot time until the
65	// clock is part of the environment.
66	pub fn new(mut env: E) -> Self {	×
67	let state = CtapState::<E>::new(&mut env);	×
68	let hid = MainHid::default();	×
69	#[cfg(feature = "vendor_hid")]	×
70	let vendor_hid = VendorHid::default();	×
71	Ctap {	×
72	env,	×
73	state,	×
74	hid,	×
75	#[cfg(feature = "vendor_hid")]	×
76	vendor_hid,	×
77	}	×
78	}	×
79
80	pub fn state(&mut self) -> &mut CtapState<E> {	×
81	&mut self.state	×
82	}	×
83
84	pub fn hid(&mut self) -> &mut MainHid<E> {	×
85	&mut self.hid	×
86	}	×
87
88	pub fn env(&mut self) -> &mut E {	×
89	&mut self.env	×
90	}	×
91
92	pub fn process_hid_packet(	×
93	&mut self,	×
94	packet: &HidPacket,	×
95	transport: Transport,	×
96	) -> HidPacketIterator {	×
97	match transport {	×
98	Transport::MainHid => {
99	#[cfg(not(feature = "vendor_hid"))]
100	let is_disabled = false;
101	#[cfg(feature = "vendor_hid")]
102	let is_disabled = self.vendor_hid.has_channel_lock(&mut self.env);	×
103	self.hid	×
104	.process_hid_packet(&mut self.env, packet, is_disabled, &mut self.state)	×
105	}
106	#[cfg(feature = "vendor_hid")]
107	Transport::VendorHid => {
108	let is_disabled = self.hid.has_channel_lock(&mut self.env);	×
109	self.vendor_hid.process_hid_packet(	×
110	&mut self.env,	×
111	packet,	×
112	is_disabled,	×
113	&mut self.state,	×
114	)	×
115	}
116	}
117	}	×
118
119	pub fn should_wink(&mut self) -> bool {	×
120	self.hid.should_wink(&mut self.env)	×
121	}	×
122
123	#[cfg(feature = "with_ctap1")]
124	pub fn u2f_grant_user_presence(&mut self) {	×
125	self.state.u2f_grant_user_presence(&mut self.env)	×
126	}	×
127
128	#[cfg(feature = "with_ctap1")]
129	pub fn u2f_needs_user_presence(&mut self) -> bool {	×
130	self.state.u2f_needs_user_presence(&mut self.env)	×
131	}	×
132	}

google / OpenSK / 4412310981

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous