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 wasm foundation #363

Merged
merged 42 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
653c245
Add new web5_wasm crate, add Justfile recipes
KendallWeihe Sep 19, 2024
bde8074
Consolidate http calls
KendallWeihe Sep 19, 2024
5a34fa3
Fix jsonschema depedency
KendallWeihe Sep 19, 2024
cbf783a
Compile away reqwest for wasm
KendallWeihe Sep 19, 2024
a19a572
Add global http client var
KendallWeihe Sep 19, 2024
8bbce34
Add Jwk wasm binding
KendallWeihe Sep 19, 2024
74d18e9
Stub in starter typescript project
KendallWeihe Sep 19, 2024
cb52e21
Redo typescript project following girlmath
KendallWeihe Sep 19, 2024
a577e69
Remove unnecessary comments
KendallWeihe Sep 19, 2024
b214745
Add assertion to test
KendallWeihe Sep 19, 2024
08ba611
Add typescript, add wasm build, call from test
KendallWeihe Sep 19, 2024
4199934
Bind Jwk and Web5Error
KendallWeihe Sep 20, 2024
ea38ad5
Add discerning property to Web5Error
KendallWeihe Sep 20, 2024
d862b15
Prototype foreign function calls embedded within a type
KendallWeihe Sep 20, 2024
43a4ec9
Prototype foreign signer
KendallWeihe Sep 20, 2024
1cf32fa
Bind Ed25519 generator and signer
KendallWeihe Sep 20, 2024
89b4ad9
Bind InMemoryKeyManager
KendallWeihe Sep 20, 2024
20223f6
Make jose public
KendallWeihe Sep 20, 2024
e640319
Add Jws
KendallWeihe Sep 20, 2024
852e43a
Fix detached typo
KendallWeihe Sep 20, 2024
4897174
Add aud to JwtClaims, add Default to JwtClaims
KendallWeihe Sep 20, 2024
6c512e6
Fix aud to array of strings
KendallWeihe Sep 20, 2024
d8504f0
Add eddsa to Dsa from_str
KendallWeihe Sep 21, 2024
1b42d19
Match off crv not alg, fix kt tests
KendallWeihe Sep 21, 2024
80f2161
Fix presentation definition casing bug
KendallWeihe Sep 21, 2024
78d865f
Fix kt PD json casing
KendallWeihe Sep 21, 2024
1366524
Fix PD null serialization
KendallWeihe Sep 23, 2024
544a3b0
Restore LICENSE
KendallWeihe Sep 23, 2024
bd45c64
Uninstall pnpm
KendallWeihe Sep 23, 2024
103dbef
Restore pom.xml
KendallWeihe Sep 23, 2024
51070e6
Remove poc code
KendallWeihe Sep 23, 2024
e85bd45
Restore commented test assertion
KendallWeihe Sep 23, 2024
720212a
Fix gitignore for LICENSE
KendallWeihe Sep 23, 2024
ed7f439
Merge branch 'main' into kendall/bind-wasm-starter
KendallWeihe Sep 24, 2024
a3ba3ea
Add http-std
KendallWeihe Sep 24, 2024
ef63168
Remove unnecessary comment
KendallWeihe Sep 24, 2024
4a5787f
Fix linting, fix Dockerfile builds
KendallWeihe Sep 24, 2024
c08932a
Add stream flush and 60 sec timeout
KendallWeihe Sep 24, 2024
4d58a72
Add ReqwestClient, fix kt tests
KendallWeihe Sep 24, 2024
bcec3d2
Fix docker builds
KendallWeihe Sep 24, 2024
68c2005
Fix musl builds
KendallWeihe Sep 24, 2024
8c21361
Fix wasm build
KendallWeihe Sep 24, 2024
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
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,11 @@ Cargo.lock

# Do not put native binaries in source control
bound/kt/src/main/resources/*.dylib
bound/kt/src/main/resources/*.so
bound/kt/src/main/resources/*.so

LICENSE
.vscode/
bound/typescript/dist/*
!bound/typescript/dist/index.js
bound/typescript/tests/compiled
bound/typescript/src/wasm/generated.js
13 changes: 6 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[workspace]
members = [
"crates/web5",
"crates/web5_cli",
"bindings/web5_uniffi",
"bindings/web5_uniffi_wrapper",
]
default-members = [
members = [
"bindings/web5_uniffi",
"bindings/web5_uniffi_wrapper",
"bindings/web5_wasm",
"crates/web5",
"crates/web5_cli",
]
default-members = ["crates/web5"]
resolver = "2"

[workspace.package]
Expand Down
8 changes: 7 additions & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ setup:
git submodule update --init --recursive
fi
if [[ "$(cargo 2>&1)" == *"rustup could not choose a version of cargo to run"* ]]; then
rustup default 1.74.0
rustup default 1.76.0 # TODO undo this
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@diehuxx I know this is no bueno but thinking of leaving it for now. I had to do it because of the wasm-pack version we're using... though we could look into moving to a lower wasm-pack I'm not sure what the consequences would be. Lmk your thoughts.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine. We CI job that checks if the web5 crate has MSRV 1.74. The CI job checks crates/web5/Cargo.toml to get rust-version = 1.74, so as long as we don't change that, we're fine.

The only drawback of using a higher rust version during development is that we may accidentally use features in crates/web5 that aren't supported in version 1.74. If that happens, we'll just notice them in the CI job failure and fix afterward.

rustup target add aarch64-apple-darwin
fi
if ! command -v wasm-pack >/dev/null || [[ "$(wasm-pack --version)" != "wasm-pack 0.13.0" ]]; then
cargo install wasm-pack --version 0.13.0
fi

docs: setup
cargo doc --open --no-deps
Expand Down Expand Up @@ -46,3 +49,6 @@ test-bound: setup

test-kotlin: setup
cd bound/kt && mvn clean test

wasm: setup
(cd bindings/web5_wasm; wasm-pack build --target nodejs --out-dir ../../bound/typescript/pkg)
201 changes: 0 additions & 201 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,201 +0,0 @@
Apache License
KendallWeihe marked this conversation as resolved.
Show resolved Hide resolved
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

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.
File renamed without changes.
1 change: 1 addition & 0 deletions bin/.pnpm-9.6.0.pkg
2 changes: 1 addition & 1 deletion bin/corepack
2 changes: 1 addition & 1 deletion bin/node
2 changes: 1 addition & 1 deletion bin/npm
2 changes: 1 addition & 1 deletion bin/npx
1 change: 1 addition & 0 deletions bin/pnpm
16 changes: 16 additions & 0 deletions bindings/web5_wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[package]
name = "web5_wasm"
version = "0.1.0"
edition = "2021"
homepage.workspace = true
repository.workspace = true
license-file.workspace = true

[dependencies]
serde = { workspace = true }
serde-wasm-bindgen = "0.6.5"
wasm-bindgen = "0.2.93"
web5 = { path = "../../crates/web5" }

[lib]
crate-type = ["cdylib"]
63 changes: 63 additions & 0 deletions bindings/web5_wasm/src/crypto/dsa.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
use super::jwk::WasmJwk;
use crate::errors::{map_err, Result};
use std::sync::Arc;
use wasm_bindgen::prelude::wasm_bindgen;
use web5::crypto::dsa::{
ed25519::{Ed25519Generator, Ed25519Signer},
secp256k1::{Secp256k1Generator, Secp256k1Signer},
Signer,
};

#[wasm_bindgen]
pub struct WasmSigner {
inner: Arc<dyn Signer>,
}

impl From<Ed25519Signer> for WasmSigner {
fn from(value: Ed25519Signer) -> Self {
Self {
inner: Arc::new(value),
}
}
}

impl From<Secp256k1Signer> for WasmSigner {
fn from(value: Secp256k1Signer) -> Self {
Self {
inner: Arc::new(value),
}
}
}

impl From<Arc<dyn Signer>> for WasmSigner {
fn from(value: Arc<dyn Signer>) -> Self {
Self { inner: value }
}
}

#[wasm_bindgen]
impl WasmSigner {
pub fn sign(&self, payload: &[u8]) -> Result<Vec<u8>> {
self.inner.sign(payload).map_err(map_err)
}
}

#[wasm_bindgen]
pub fn generate_ed25519_key() -> Result<WasmJwk> {
Ok(Ed25519Generator::generate().into())
}

#[wasm_bindgen]
pub fn generate_secp256k1_key() -> Result<WasmJwk> {
Ok(Secp256k1Generator::generate().into())
}

#[wasm_bindgen]
pub fn new_ed25519_signer(jwk: WasmJwk) -> Result<WasmSigner> {
Ok(Ed25519Signer::new(jwk.into()).into())
}

#[wasm_bindgen]
pub fn new_secp256k1_signer(jwk: WasmJwk) -> Result<WasmSigner> {
Ok(Secp256k1Signer::new(jwk.into()).into())
}
Loading