Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1471 check shielding key inside pallet #1479

Merged
merged 13 commits into from
Mar 19, 2023
Merged

1471 check shielding key inside pallet #1479

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6e1ebde
move checking valid user shielding key into pallet extrinsics: create…
BillyWooo Mar 16, 2023
b495baa
pass the unit test
BillyWooo Mar 16, 2023
02dbc22
update ts test
BillyWooo Mar 16, 2023
23bb59a
revert back checking user shielding key
BillyWooo Mar 17, 2023
57a61c3
add ts test
BillyWooo Mar 17, 2023
9a3583f
Merge remote-tracking branch 'origin/dev' into 1471_check_shielding_k…
BillyWooo Mar 17, 2023
2bb3b77
use runtime network type
BillyWooo Mar 18, 2023
32927fe
fix unit test
BillyWooo Mar 18, 2023
97a1c23
simply rename
BillyWooo Mar 18, 2023
f568ce4
only log is enough
BillyWooo Mar 18, 2023
a3e61f6
add extra unit test to check InvalidUserShieldingKey
BillyWooo Mar 18, 2023
059a7f6
refactor: move duplicate code
BillyWooo Mar 18, 2023
28bdb17
refactor to remove duplicate code
BillyWooo Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tee-worker/litentry/core/data-providers/src/graphql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ impl From<SubstrateNetwork> for VerifiedCredentialsNetwork {
SubstrateNetwork::Polkadot => Self::Polkadot,
SubstrateNetwork::Kusama => Self::Kusama,
SubstrateNetwork::Khala => Self::Khala,
SubstrateNetwork::TestNet => todo!(),
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion tee-worker/litentry/pallets/identity-management/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ pub mod pallet {
pub enum Error<T> {
/// challenge code doesn't exist
ChallengeCodeNotExist,
/// Invalid user shielding Key
InvalidUserShieldingKey,
/// the pair (litentry-account, identity) already verified when creating an identity
IdentityAlreadyVerified,
/// the pair (litentry-account, identity) doesn't exist
Expand Down Expand Up @@ -200,6 +202,8 @@ pub mod pallet {
parent_ss58_prefix: u16,
) -> DispatchResult {
T::ManageOrigin::ensure_origin(origin)?;
ensure!(Self::user_shielding_keys(&who).is_some(), Error::<T>::InvalidUserShieldingKey);
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved

if let Some(c) = IDGraphs::<T>::get(&who, &identity) {
ensure!(
!(c.is_verified && c.creation_request_block != Some(0)),
Expand All @@ -218,7 +222,7 @@ pub mod pallet {
}

let prime_id = Identity::Substrate {
network: SubstrateNetwork::Litentry,
network: SubstrateNetwork::get_network(parent_ss58_prefix),
address: prime_user_address,
};
if IDGraphs::<T>::get(&who, &prime_id).is_none() {
Expand Down Expand Up @@ -250,6 +254,7 @@ pub mod pallet {
identity: Identity,
) -> DispatchResult {
T::ManageOrigin::ensure_origin(origin)?;
ensure!(Self::user_shielding_keys(&who).is_some(), Error::<T>::InvalidUserShieldingKey);
ensure!(IDGraphs::<T>::contains_key(&who, &identity), Error::<T>::IdentityNotExist);
if let Some(IdentityContext::<T> {
metadata,
Expand Down Expand Up @@ -281,6 +286,7 @@ pub mod pallet {
verification_request_block: ParentchainBlockNumber,
) -> DispatchResult {
T::ManageOrigin::ensure_origin(origin)?;
ensure!(Self::user_shielding_keys(&who).is_some(), Error::<T>::InvalidUserShieldingKey);
IDGraphs::<T>::try_mutate(&who, &identity, |context| -> DispatchResult {
let mut c = context.take().ok_or(Error::<T>::IdentityNotExist)?;

Expand Down
52 changes: 50 additions & 2 deletions tee-worker/litentry/pallets/identity-management/src/tests.rs
View file
Open in desktop
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ fn set_user_shielding_key_works() {
#[test]
fn create_identity_works() {
new_test_ext().execute_with(|| {
let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
BOB,
shielding_key.clone()
));

BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
let ss58_prefix = 131_u16;
let metadata: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
assert_ok!(IMT::create_identity(
Expand All @@ -71,8 +78,15 @@ fn create_identity_works() {
#[test]
fn remove_identity_works() {
new_test_ext().execute_with(|| {
let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));

let metadata: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
let ss58_prefix = 131_u16;
let ss58_prefix = 31_u16;
assert_noop!(
IMT::remove_identity(RuntimeOrigin::signed(ALICE), BOB, alice_web3_identity()),
Error::<Test>::IdentityNotExist
Expand Down Expand Up @@ -115,6 +129,13 @@ fn remove_identity_works() {
#[test]
fn verify_identity_works() {
new_test_ext().execute_with(|| {
let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));

let metadata: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
let ss58_prefix = 131_u16;
assert_ok!(IMT::create_identity(
Expand Down Expand Up @@ -146,6 +167,13 @@ fn verify_identity_works() {
#[test]
fn get_id_graph_works() {
new_test_ext().execute_with(|| {
let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));

let metadata3: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
let ss58_prefix = 131_u16;
assert_ok!(IMT::create_identity(
Expand Down Expand Up @@ -195,6 +223,13 @@ fn verify_identity_fails_when_too_early() {
const CREATION_REQUEST_BLOCK: ParentchainBlockNumber = 2;
const VERIFICATION_REQUEST_BLOCK: ParentchainBlockNumber = 1;

let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));

let metadata: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
let ss58_prefix = 131_u16;
assert_ok!(IMT::create_identity(
Expand Down Expand Up @@ -232,6 +267,12 @@ fn verify_identity_fails_when_too_late() {
const CREATION_REQUEST_BLOCK: ParentchainBlockNumber = 1;
const VERIFICATION_REQUEST_BLOCK: ParentchainBlockNumber = 5;

let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));
let metadata: MetadataOf<Test> = vec![0u8; 16].try_into().unwrap();
let ss58_prefix = 131_u16;
assert_ok!(IMT::create_identity(
Expand Down Expand Up @@ -266,6 +307,13 @@ fn verify_identity_fails_when_too_late() {
#[test]
fn get_id_graph_with_max_len_works() {
new_test_ext().execute_with(|| {
let shielding_key: UserShieldingKeyType = [0u8; USER_SHIELDING_KEY_LEN];
assert_ok!(IMT::set_user_shielding_key(
RuntimeOrigin::signed(ALICE),
BOB,
shielding_key.clone()
));

// fill in 21 identities, starting from 1 to reserve place for prime_id
for i in 1..22 {
assert_ok!(IMT::create_identity(
Expand All @@ -292,6 +340,6 @@ fn get_id_graph_with_max_len_works() {
let id_graph = IMT::get_id_graph_with_max_len(&BOB, 30);
assert_eq!(id_graph.len(), 22);
assert_eq!(String::from_utf8(id_graph.get(0).unwrap().0.flat()).unwrap(), "did:twitter:web2:_:alice21");
assert_eq!(String::from_utf8(id_graph.get(21).unwrap().0.flat()).unwrap(), "did:litentry:web3:substrate:0x0202020202020202020202020202020202020202020202020202020202020202");
assert_eq!(String::from_utf8(id_graph.get(21).unwrap().0.flat()).unwrap(), "did:litmus:web3:substrate:0x0202020202020202020202020202020202020202020202020202020202020202");
});
}
13 changes: 13 additions & 0 deletions tee-worker/litentry/primitives/src/identity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ pub enum SubstrateNetwork {
Litentry,
Litmus,
Khala,
TestNet,
}

impl SubstrateNetwork {
Expand All @@ -84,6 +85,18 @@ impl SubstrateNetwork {
Self::Litentry => 31,
Self::Litmus => 131,
Self::Khala => 30,
Self::TestNet => 13,
}
}

pub fn get_network(prefix: u16) -> Self {
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
match prefix {
0 => Self::Polkadot,
2 => Self::Kusama,
31 => Self::Litentry,
131 => Self::Litmus,
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
30 => Self::Khala,
_ => Self::TestNet,
}
}
}
Expand Down
21 changes: 18 additions & 3 deletions tee-worker/ts-tests/identity.test.ts
View file
Open in desktop
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ describeLitentry('Test Identity', (context) => {
var signature_ethereum;
var signature_substrate;

step('Invalid user shielding key', async function () {
const encode = context.api.createType('LitentryIdentity', substrateIdentity).toHex();
const ciphertext = encryptWithTeeShieldingKey(context.teeShieldingKey, encode).toString('hex');
const tx = context.api.tx.identityManagement.createIdentity(context.mrEnclave, context.defaultSigner[0].address, `0x${ciphertext}`, null);
await sendTxUntilInBlock(context.api, tx, context.defaultSigner[0]);

const events = await listenEvent(context.api, 'identityManagement', ['StfError']);
expect(events.length).to.be.equal(1);

await checkFailReason(events, 'InvalidUserShieldingKey', true);
})

step('set user shielding key', async function () {
const alice = await setUserShieldingKey(context, context.defaultSigner[0], aesKey, true);
assert.equal(alice, u8aToHex(context.defaultSigner[0].addressRaw), 'check caller error');
Expand Down Expand Up @@ -331,7 +343,8 @@ describeLitentry('Test Identity', (context) => {
const substratePrimeIdentity = <LitentryIdentity>{
Substrate: <SubstrateIdentity>{
address: `0x${Buffer.from(context.defaultSigner[0].publicKey).toString('hex')}`,
network: 'Litentry',
// When testing with integritee-node, change network to: TestNet
network: 'Litmus',
BillyWooo marked this conversation as resolved.
Show resolved Hide resolved
},
};

Expand All @@ -342,7 +355,8 @@ describeLitentry('Test Identity', (context) => {

const events = await listenEvent(context.api, 'identityManagement', ['StfError']);
expect(events.length).to.be.equal(1);
const result = events[0].method as string;

await checkFailReason(events, 'RemovePrimeIdentityDisallowed', true);
});

step('remove error identities', async function () {
Expand All @@ -359,8 +373,9 @@ describeLitentry('Test Identity', (context) => {

await checkFailReason(resp_not_exist_identities, 'IdentityNotExist', true);

//remove a challenge code before the code is set
//context.defaultSigner[2] doesn't have a challenge code
const bob = await setUserShieldingKey(context, context.defaultSigner[2], aesKey, true);
assert.equal(bob, u8aToHex(context.defaultSigner[2].addressRaw), 'check caller error');
const resp_not_created_identities = (await removeErrorIdentities(
context,
context.defaultSigner[2],
Expand Down
4 changes: 2 additions & 2 deletions tee-worker/ts-tests/type-definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const teeTypes = {
_enum: ['Twitter', 'Discord', 'Github'],
},
SubstrateNetwork: {
_enum: ['Polkadot', 'Kusama', 'Litentry', 'Litmus'],
_enum: ['Polkadot', 'Kusama', 'Litentry', 'Litmus', 'Khala', 'TestNet'],
},
EvmNetwork: {
_enum: ['Ethereum', 'BSC'],
Expand Down Expand Up @@ -275,7 +275,7 @@ export type Web3Network = {
};

export type Web2Network = 'Twitter' | 'Discord' | 'Github';
export type SubstrateNetwork = 'Polkadot' | 'Kusama' | 'Litentry' | 'Litmus';
export type SubstrateNetwork = 'Polkadot' | 'Kusama' | 'Litentry' | 'Litmus' | 'Khala' | 'TestNet';
export type EvmNetwork = 'Ethereum' | 'BSC';

export type IdentityGenericEvent = {
Expand Down