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.

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

Add server.getPublicKey implementation #38

Merged
merged 2 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions cpp/opaque-rust.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,8 @@ ::rust::repr::PtrLen cxxbridge1$opaque_finish_client_login(::OpaqueFinishClientL

void cxxbridge1$opaque_create_server_setup(::rust::String *return$) noexcept;

::rust::repr::PtrLen cxxbridge1$opaque_get_server_public_key(::rust::String *data, ::rust::String *return$) noexcept;

::rust::repr::PtrLen cxxbridge1$opaque_create_server_registration_response(::OpaqueCreateServerRegistrationResponseParams *params, ::OpaqueCreateServerRegistrationResponseResult *return$) noexcept;

::rust::repr::PtrLen cxxbridge1$opaque_start_server_login(::OpaqueStartServerLoginParams *params, ::OpaqueStartServerLoginResult *return$) noexcept;
Expand Down Expand Up @@ -1006,6 +1008,15 @@ ::rust::String opaque_create_server_setup() noexcept {
return ::std::move(return$.value);
}

::rust::String opaque_get_server_public_key(::rust::String data) {
::rust::MaybeUninit<::rust::String> return$;
::rust::repr::PtrLen error$ = cxxbridge1$opaque_get_server_public_key(&data, &return$.value);
if (error$.ptr) {
throw ::rust::impl<::rust::Error>::error(error$);
}
return ::std::move(return$.value);
}

::OpaqueCreateServerRegistrationResponseResult opaque_create_server_registration_response(::OpaqueCreateServerRegistrationResponseParams params) {
::rust::ManuallyDrop<::OpaqueCreateServerRegistrationResponseParams> params$(::std::move(params));
::rust::MaybeUninit<::OpaqueCreateServerRegistrationResponseResult> return$;
Expand Down
2 changes: 2 additions & 0 deletions cpp/opaque-rust.h
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,8 @@ ::std::unique_ptr<::OpaqueFinishClientLoginResult> opaque_finish_client_login(::

::rust::String opaque_create_server_setup() noexcept;

::rust::String opaque_get_server_public_key(::rust::String data);

::OpaqueCreateServerRegistrationResponseResult opaque_create_server_registration_response(::OpaqueCreateServerRegistrationResponseParams params);

::OpaqueStartServerLoginResult opaque_start_server_login(::OpaqueStartServerLoginParams params);
Expand Down
447 changes: 227 additions & 220 deletions cpp/react-native-opaque.cpp

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ PODS:
- React-jsinspector (0.71.6)
- React-logger (0.71.6):
- glog
- react-native-opaque (0.2.4):
- react-native-opaque (0.2.7):
- React-Core
- React-perflogger (0.71.6)
- React-RCTActionSheet (0.71.6):
Expand Down Expand Up @@ -606,7 +606,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 7894956638ff3e00819dd3f9f6f4a84da38f2409
React-jsinspector: d5ce2ef3eb8fd30c28389d0bc577918c70821bd6
React-logger: 9332c3e7b4ef007a0211c0a9868253aac3e1da82
react-native-opaque: b1da36aedd83aedd57a032f87ebd45fd1e7c9de8
react-native-opaque: f384271b45bffee93b0cd3d30987043a2d4b2ed5
React-perflogger: 43392072a5b867a504e2b4857606f8fc5a403d7f
React-RCTActionSheet: c7b67c125bebeda9fb19fc7b200d85cb9d6899c4
React-RCTAnimation: c2de79906f607986633a7114bee44854e4c7e2f5
Expand Down
25 changes: 25 additions & 0 deletions example/src/OpaqueTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ test('full registration & login flow', () => {

expect(registrationExportKey).toEqual(loginExportKey);
expect(registrationServerStaticPublicKey).toEqual(loginServerStaticPublicKey);
expect(loginServerStaticPublicKey).toEqual(
opaque.server.getPublicKey(serverSetup)
);

const { sessionKey: serverSessionKey } = opaque.server.finishLogin({
serverLoginState,
Expand Down Expand Up @@ -728,3 +731,25 @@ describe('server.finishLogin', () => {
);
});
});

describe('server.getPublicKey', () => {
test('empty string', () => {
expect(() => opaque.server.getPublicKey('')).toThrow(
'opaque protocol error at "deserialize serverSetup"; Internal error encountered'
);
});
test('invalid encoding', () => {
expect(() => opaque.server.getPublicKey('a')).toThrow(
'base64 decoding failed at "serverSetup"; Encoded text cannot have a 6-bit remainder.'
);
});
test('incomplete server setup string', () => {
expect(() =>
opaque.server.getPublicKey(
'pdT3ISgoWCP1G1lOTpU6uopNEMabryz4N3d1R-dRmF2jmigPsYk-aOL4J0cpPpqBXzEc900G7dZgIxjjzkItIbfzzo9cSh92xq7XZjuvlSs21BDddsKC5TmvRP8QT-wCucEXnwDy2aDLJmzZl-tRHb2Mz5my_vGZeO3KeNS_wA'
)
).toThrow(
'opaque protocol error at "deserialize serverSetup"; Internal error encountered'
);
});
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,6 @@
]
},
"dependencies": {
"@serenity-kit/opaque": "^0.7.0"
"@serenity-kit/opaque": "^0.8.0"
}
}
8 changes: 8 additions & 0 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ mod opaque_ffi {

fn opaque_create_server_setup() -> String;

fn opaque_get_server_public_key(data: String) -> Result<String>;

fn opaque_create_server_registration_response(
params: OpaqueCreateServerRegistrationResponseParams,
) -> Result<OpaqueCreateServerRegistrationResponseResult>;
Expand Down Expand Up @@ -207,6 +209,12 @@ fn opaque_create_server_setup() -> String {
BASE64.encode(setup.serialize())
}

fn opaque_get_server_public_key(data: String) -> Result<String, Error> {
let server_setup = decode_server_setup(data)?;
let pub_key = server_setup.keypair().public().serialize();
Ok(BASE64.encode(pub_key))
}

fn opaque_create_server_registration_response(
params: OpaqueCreateServerRegistrationResponseParams,
) -> Result<OpaqueCreateServerRegistrationResponseResult, Error> {
Expand Down
3 changes: 3 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ export namespace client {

declare function opaque_createServerSetup(): string;

declare function opaque_getServerPublicKey(serverSetup: string): string;

declare function opaque_createServerRegistrationResponse(
params: server.CreateRegistrationResponseParams
): server.CreateRegistrationResponseResult;
Expand Down Expand Up @@ -132,6 +134,7 @@ export namespace server {
};

export const createSetup = opaque_createServerSetup;
export const getPublicKey = opaque_getServerPublicKey;
export const createRegistrationResponse =
opaque_createServerRegistrationResponse;
export const startLogin = opaque_startServerLogin;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2048,10 +2048,10 @@
conventional-recommended-bump "^6.1.0"
semver "7.3.8"

"@serenity-kit/opaque@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@serenity-kit/opaque/-/opaque-0.7.0.tgz#58e90e4c56a3152e664670ef2876b833f96832d5"
integrity sha512-5CikruVTY7EAAhLvHHU139OOaWRIIq58HhDRjpPDZOS8gAaF9qSfZRyR4kuEqGZWOuNjUtilDwD2G3Nc3YlJzw==
"@serenity-kit/opaque@^0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@serenity-kit/opaque/-/opaque-0.8.0.tgz#82ef4056238611514c0a1e2072015b39a1732dd5"
integrity sha512-xZ4HV++Q6Ej2lss9oECMxCCPgRgEXJ/6iqOaqKJO3mRrW6huIaM3zGre47jQEQk37SgSpDBY1mYyw5n+JvwTxA==

"@sideway/address@^4.1.3":
version "4.1.4"
Expand Down
Loading