Changes to support ACME, including JWS #359

andrewbaxter · 2024-01-10T12:08:24Z

Keats

It would also need a README update

Keats · 2024-01-10T18:24:36Z

src/header.rs

+    ///
+    /// Defined in [RFC8555#6.5.2](https://datatracker.ietf.org/doc/html/rfc8555#section-6.5.2).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub nonce: Option<String>,


Can you add #347 (comment) while you're there?

I added crit, enc, and zip -- I think I have the values there right, but I'm not familiar with their use so double checking it would probably be good.

Thanks. @inferiorhumanorgans can you have a look?

Keats · 2024-01-10T18:31:12Z

src/decoding.rs

+        return Err(new_error(ErrorKind::InvalidSignature));
+    }
+
+    Ok(header)


We can probably macro it out to avoid duplicating the code from verify_signature

I tried factoring out a function, let me know if this works for you.

gregparsons · 2024-01-11T01:02:00Z

One test here. Works great. Thanks @andrewbaxter!

andrewbaxter · 2024-01-11T15:33:36Z

Awesome, and thanks for the comments! Sorry, I didn't quite get to this today. I'll try to do it tomorrow.

andrewbaxter · 2024-01-12T11:36:27Z

It would also need a README update

I added a (very simple) example to the readme, let me know if there's other additions you think would be good.

andrewbaxter · 2024-01-14T13:59:39Z

My (limited) real world testing worked.

Keats · 2024-01-15T09:28:37Z

I will have to read the specs and review the PR properly as I don't really know/use JWK/JWS myself. That's going to take some time but if more people can try that would be great

randomairborne · 2024-01-15T18:30:34Z

Can I support the work on this somehow? I don't know if I have the technical aptitude to help review, but if I can be of other assistance I would love to.

Keats · 2024-01-16T08:55:36Z

Ideally maybe we could get one single PR (@andrewbaxter can change the target of other PRs to this one) so we can point at a single point for people to test

andrewbaxter · 2024-01-16T09:41:44Z

Keep them separate but just change the target? Or should I combine them all? Aside from loading urlsafe base64 hmacs I don't think I have any others incoming

Keats · 2024-01-16T09:42:38Z

change the target, we review them and then we can do a big review of the whole thing on this PR

andrewbaxter · 2024-01-16T09:42:41Z

@randomairborne do you have any use cases you could try it with? I looked at various acme libraries and they all seemed to be doing their own jwt stuff (and didn't support EAB). I ended up hacking it into Poem's acme implementation, but I have some reservations about that

andrewbaxter · 2024-01-16T09:42:55Z

Okay, great!

andrewbaxter · 2024-01-16T09:46:31Z

@Keats I'm not sure I can re-target MRs in this repo to branches in my fork... sorry, my github ineptitude on full display. AFAICT it only allows me to select branches in this repo.

Edit: I'll try stacking them and recreating the MRs in my fork.

randomairborne · 2024-01-16T16:54:56Z

I'm attempting to write a new ACME library 😅. If this has a somewhat functional public API, I'll start using it.

andrewbaxter · 2024-01-17T10:30:18Z

Sorry didn't get to this yesterday. I'll do it now

andrewbaxter · 2024-01-17T11:36:53Z

Okay I made
andrewbaxter#1
andrewbaxter#2
andrewbaxter#3

targeted at this branch, and andrewbaxter#4 with them all merged together if you want to try stuff out.

I think this is everything needed for ACME, but I haven't read through all the different flows in ACME so it's possible some stuff is still missing.

I added you @Keats as a collaborator in case you wanted to merge them into this one. I can close the other MRs in this repo if that would be good.

Add support for JWK thumbprints

Method to load urlsafe base64 hmac encoding key

Add method to generate JWK from EncodingKey

Keats · 2024-01-22T16:42:34Z

Ok if there are any JWS/ACME users, can they try that branch?

Keats · 2024-03-21T22:15:53Z

Has anyone tried it?

andrewbaxter · 2024-03-23T13:11:23Z

Aside from me I assume... 😅

fuch1m · 2024-04-05T10:00:53Z

I tried to test decoding of a Jws.

I added the following line in my Cargo.toml

jsonwebtoken = { git = "https://github.com/andrewbaxter/fork-jsonwebtoken.git", branch = "branch-integration" }

But I don't know how to transform the string slice containing the Jws into a Jws type which is required by the decode_jws function. I can't hand over just the string slice. This is possible with the regular decode function for jwt.

let jws_token="eyJhbGciOiJSUzI1NiIsIng1dCI6IlptWXlNRFprTlRoa05Ua3lZalkyWW1VM1pEQTFNRE5oWkdSbFl6TTJNamhrTTJWaE1EUTJZUW8ifQ.eyJtZXRhZGF0YS12ZXJzaW9uIjoiMC4wLjEiLCJuYW1lIjoiY29tLmJyLWF1dG9tYXRpb24uYXV0b21hdGlvbnJ1bnRpbWUiLCJ2ZXJzaW9uIjoiNi4wLjAiLCJhcnRpZmFjdHMiOlt7ImZpbGUiOiJhci5lZWI0NGY5ZGRjNWY0MzM2YTEyODJmOGNlZWYwYWI5MzQ0NDJkZTdiNTc0NzJjZGI1YjA1OGZkMDkyNmIzNDc1LnRhciIsInNoYTI1NiI6ImM1NmI3ZGFiYmM3YWE3MzBlZWFiMDc2NjhiZGNiZDdlM2Q0MDg1NTA0N2NhOWEwY2MxYmZlZDIzYTI0ODYxMTEiLCJhcmNoaXRlY3R1cmUiOiJ4ODZfNjQifSx7ImZpbGUiOiJhci4wMTMzMDc5MTg2YzZhYTYwMmNjYjA5ODA5MTU1MzNmMDNiMDFhMDA3MDFiMWYzOWMwMGYyYmYxZjczMDYxZTM2LnRhciIsInNoYTI1NiI6IjU3OGNjODYwYmFjMGM4MTM5MmViNzAyNjJiMmVjZjNlNmM1MjFhYTY0N2JjMjBkNjcyOWNhNTE4NDZhZWEwNWUiLCJhcmNoaXRlY3R1cmUiOiJhYXJjaDY0In0seyJmaWxlIjoiY29tcG9zZTEueW1sIiwic2hhMjU2IjoiMjY2NjU5Njg2NzY3MDY5YmY2NDI5NmNiNGJkYjkxNDZkNzM3Mzg0MTM4NzVjYzEyNTcyNDgwN2M1NGZhNTFhMiIsImFyY2hpdGVjdHVyZSI6Ing4Nl82NCJ9LHsiZmlsZSI6ImNvbXBvc2UyLnltbCIsInNoYTI1NiI6IjE5YTljNTdkMWQwNjVlNGZjNTdkODMxY2IzNmI4Y2U1ZTU3ODk0MDFkM2Q1N2JhNTUyZTJkNjM0YTg4NjkwYjAiLCJhcmNoaXRlY3R1cmUiOiJhYXJjaDY0In1dfQ.PMuAg_M-IqiGY8s6KeiUra30mxUwulgrGkI4YaEMIwsOUE-cI2oqOxWkV4OUJ9NNVnUGWuuBO6E4VFCsabWL3fsIPyl_7mrGToNPAka7OxaadQXhFhZwzaGuBi879-pWVm5NNtjjCO1inDw6dDBLVj89HWeBQxgEgVwYWA1P6lbCLFrstlb_2Qp8yY44KAQDV3bVudmlZn_VaxKlsFSc8_8DOPaeFwbWjqG1XT4WrKAiKFnQCqnzaSyH4O-0bPiZ7rq04mfA6-Nm7ZNnrST3dbG6v9f5Ku9qHu6Nfs0uMGIclLN8Krzk365IuCnLp_W3zL7bTwJ3VGMj6AHjH5U4Jw";
let public_key = "-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5JX/bCT4jVCtzesSMHd8
Wu7ksIs3tFhw/8oYB+4cLik5sjvc1HiWWA50UK7TIERIIuXq0SAulV9xbHLrZjZn
iU2hbN83+7LySfzQxQRwfIVLFRsUqcm23ZZFMCHxuzEfwl/m+61AkDzARmoUVCyh
LXlomjKzN45RZZqSHVkvpJWidqKcVCtdjsGnVZeeX4TG6QI/hbzRm4y6oxLwriwJ
vl2bz+lJUN57XxhtCgYtdhUa8PfD+5mC26xlLvMfru3Ic1+NKgcZi1g5dmOMQOpY
PnLPN2VKbA9Nx+RxlQK1C+R/mmEM6lGZbSqxHUa3WuB725gVNN+tHTUfsprjax7b
PQIDAQAB
-----END PUBLIC KEY-----";

let decoding_key = DecodingKey::from_rsa_pem(public_key.as_bytes()).unwrap_or_else(|err| {
    println!("Error creating decoding key: {}", err);
    panic!("Decoding key creation failed");
});
let validation = Validation::new(Algorithm::RS256);
let decoded_token: TokenData<serde_json::Value> = match decode_jws(&jws_token, &decoding_key, &validation) {
    Ok(token) => token,
    Err(err) => {
        println!("Error decoding token: {}", err);
        panic!("Token decoding failed");
    }
};

andrewbaxter · 2024-04-05T17:52:49Z

Ah yeah, so it looks like you have a JWS in the "JWS Compact Serialization" form which is .-concatenated and base64 encoded.

There are two representations discussed in the RFC: JWS JSON Serialization and JWS Compact Serialization.

The JWS support I added here doesn't provide a convenience method for the compact serialization representation. It implements Serialize and Deserialize for the "JWS JSON Serialization" representation. In ACME the JSON is embedded in another structure and de/serialized together with that.

In order to use this with the Compact Serialization I think you'd need to split it by . and put the parts in a JWS object first... something like:

let mut parts = jws_token.split(".");
let jws = JWS<serde_json::Value>{
   protected: parts.next()?,
   payload: parts.next()?,
   signature: parts.next()?,
   _pd: Default::default(),
};
decode_jws(&jws, &decoding_key, &validation)...

Assuming that works, convenience methods might be a good addition but I'm not in a great position to switch gears and add it atm.

fuch1m · 2024-04-06T17:29:59Z

Thank you, I will try it in the next days!

fuch1m · 2024-04-08T08:30:46Z

Decoding my JWS in compact form works now for me. I had to disable also the default validation of "exp" via validation.set_required_spec_claims(&[""]);
Thanks!

let jws_token="eyJhbGciOiJSUzI1NiIsIng1dCI6IlptWXlNRFprTlRoa05Ua3lZalkyWW1VM1pEQTFNRE5oWkdSbFl6TTJNamhrTTJWaE1EUTJZUW8ifQ.eyJtZXRhZGF0YS12ZXJzaW9uIjoiMC4wLjEiLCJuYW1lIjoiY29tLmJyLWF1dG9tYXRpb24uYXV0b21hdGlvbnJ1bnRpbWUiLCJ2ZXJzaW9uIjoiNi4wLjAiLCJhcnRpZmFjdHMiOlt7ImZpbGUiOiJhci5lZWI0NGY5ZGRjNWY0MzM2YTEyODJmOGNlZWYwYWI5MzQ0NDJkZTdiNTc0NzJjZGI1YjA1OGZkMDkyNmIzNDc1LnRhciIsInNoYTI1NiI6ImM1NmI3ZGFiYmM3YWE3MzBlZWFiMDc2NjhiZGNiZDdlM2Q0MDg1NTA0N2NhOWEwY2MxYmZlZDIzYTI0ODYxMTEiLCJhcmNoaXRlY3R1cmUiOiJ4ODZfNjQifSx7ImZpbGUiOiJhci4wMTMzMDc5MTg2YzZhYTYwMmNjYjA5ODA5MTU1MzNmMDNiMDFhMDA3MDFiMWYzOWMwMGYyYmYxZjczMDYxZTM2LnRhciIsInNoYTI1NiI6IjU3OGNjODYwYmFjMGM4MTM5MmViNzAyNjJiMmVjZjNlNmM1MjFhYTY0N2JjMjBkNjcyOWNhNTE4NDZhZWEwNWUiLCJhcmNoaXRlY3R1cmUiOiJhYXJjaDY0In0seyJmaWxlIjoiY29tcG9zZTEueW1sIiwic2hhMjU2IjoiMjY2NjU5Njg2NzY3MDY5YmY2NDI5NmNiNGJkYjkxNDZkNzM3Mzg0MTM4NzVjYzEyNTcyNDgwN2M1NGZhNTFhMiIsImFyY2hpdGVjdHVyZSI6Ing4Nl82NCJ9LHsiZmlsZSI6ImNvbXBvc2UyLnltbCIsInNoYTI1NiI6IjE5YTljNTdkMWQwNjVlNGZjNTdkODMxY2IzNmI4Y2U1ZTU3ODk0MDFkM2Q1N2JhNTUyZTJkNjM0YTg4NjkwYjAiLCJhcmNoaXRlY3R1cmUiOiJhYXJjaDY0In1dfQ.PMuAg_M-IqiGY8s6KeiUra30mxUwulgrGkI4YaEMIwsOUE-cI2oqOxWkV4OUJ9NNVnUGWuuBO6E4VFCsabWL3fsIPyl_7mrGToNPAka7OxaadQXhFhZwzaGuBi879-pWVm5NNtjjCO1inDw6dDBLVj89HWeBQxgEgVwYWA1P6lbCLFrstlb_2Qp8yY44KAQDV3bVudmlZn_VaxKlsFSc8_8DOPaeFwbWjqG1XT4WrKAiKFnQCqnzaSyH4O-0bPiZ7rq04mfA6-Nm7ZNnrST3dbG6v9f5Ku9qHu6Nfs0uMGIclLN8Krzk365IuCnLp_W3zL7bTwJ3VGMj6AHjH5U4Jw";
let public_key = "-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5JX/bCT4jVCtzesSMHd8
Wu7ksIs3tFhw/8oYB+4cLik5sjvc1HiWWA50UK7TIERIIuXq0SAulV9xbHLrZjZn
iU2hbN83+7LySfzQxQRwfIVLFRsUqcm23ZZFMCHxuzEfwl/m+61AkDzARmoUVCyh
LXlomjKzN45RZZqSHVkvpJWidqKcVCtdjsGnVZeeX4TG6QI/hbzRm4y6oxLwriwJ
vl2bz+lJUN57XxhtCgYtdhUa8PfD+5mC26xlLvMfru3Ic1+NKgcZi1g5dmOMQOpY
PnLPN2VKbA9Nx+RxlQK1C+R/mmEM6lGZbSqxHUa3WuB725gVNN+tHTUfsprjax7b
PQIDAQAB
-----END PUBLIC KEY-----";

let decoding_key = DecodingKey::from_rsa_pem(public_key.as_bytes()).unwrap_or_else(|err| {
    println!("Error creating decoding key: {}", err);
    panic!("Decoding key creation failed");
});
let validation = Validation::new(Algorithm::RS256);
validation.set_required_spec_claims(&[""]);

let mut parts = jws_token.split(".");
let jws: Jws<serde_json::Value> = Jws {
    protected: parts.next().unwrap().to_string(),
    payload: parts.next().unwrap().to_string(),
    signature: parts.next().unwrap().to_string(),
    _pd: Default::default(),
};

let decoded_token: TokenData<serde_json::Value> = match decode_jws(&jws, &decoding_key, &validation) {
    Ok(token) => token,
    Err(err) => {
        println!("Error decoding token: {}", err);
        panic!("Token decoding failed");
    }
};

andrewbaxter · 2024-04-09T14:54:39Z

Oh excellent!

WANG-lp · 2024-04-23T15:07:46Z

any updates on this MR?

Keats · 2024-04-24T20:28:32Z

Just need some usage feedback, I'm not knowledgeable about it so I can't really have a good opinion on it

andrewbaxter · 2024-06-12T16:27:21Z

I was thinking about this, and I wonder if it wouldn't be fine to merge as is? It's new functionality, so it won't break existing users, and if there are design or implementation issues that make it unusable making changes (even ones that are nominally breaking) it won't affect anyone because there wouldn't be any users in the first place.

The main risks are that this 1. misses some use cases and the design prevents modification to allow those use cases, but that wouldn't necessarily be found by light usage feedback anyway or 2. isn't ergonomic, but I think it's a simple enough interface that that's not a large risk.

Changes to support ACME, including JWS

fd60bf2

andrewbaxter force-pushed the acme-and-jws branch from 7821a61 to fd60bf2 Compare January 10, 2024 12:18

andrew added 2 commits January 10, 2024 22:18

Add method to generate JWK from EncodingKey

b6ef547

Automated testing

7904bb1

Keats requested changes Jan 10, 2024

View reviewed changes

Crit, zip, enc, readme, refactor

b0072fd

Add support for JWK thumbprints

5a3b07f

andrewbaxter changed the title ~~Draft: Changes to support ACME, including JWS~~ Changes to support ACME, including JWS Jan 14, 2024

andrew added 4 commits January 15, 2024 20:10

Add thumbprint hash enum, clippy fixes

c64cbe2

Clippy

dbc9dbd

Clippy

f2f070b

Format fixes

a1cf7b7

Keats mentioned this pull request Jan 16, 2024

Support Extra Key/Value Pairs in the Header #364

Closed

andrew added 3 commits January 17, 2024 20:12

Merge branch 'acme-and-jws' into jwk-thumbprint

8ae98dc

Merge branch 'acme-and-jws' into jwk-from-encoding-key

dd34b25

Method to load urlsafe base64 hmac encoding key

b8cf8b2

andrewbaxter and others added 4 commits January 18, 2024 23:26

Merge pull request #1 from andrewbaxter/jwk-thumbprint

f7b51d2

Add support for JWK thumbprints

Merge pull request #3 from andrewbaxter/urlsafe-hmac-encoding-key

0cfda16

Method to load urlsafe base64 hmac encoding key

Merge branch 'acme-and-jws' into jwk-from-encoding-key

d61c791

Merge pull request #5 from andrewbaxter/jwk-from-encoding-key

4f57bea

Add method to generate JWK from EncodingKey

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes to support ACME, including JWS #359

Changes to support ACME, including JWS #359

andrewbaxter commented Jan 10, 2024

Keats left a comment

Keats Jan 10, 2024

andrewbaxter Jan 12, 2024

Keats Jan 13, 2024

Keats Jan 10, 2024

andrewbaxter Jan 12, 2024

gregparsons commented Jan 11, 2024

andrewbaxter commented Jan 11, 2024

andrewbaxter commented Jan 12, 2024

andrewbaxter commented Jan 14, 2024

Keats commented Jan 15, 2024 •

edited

Loading

randomairborne commented Jan 15, 2024

Keats commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

Keats commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024 •

edited

Loading

randomairborne commented Jan 16, 2024 •

edited

Loading

andrewbaxter commented Jan 17, 2024

andrewbaxter commented Jan 17, 2024 •

edited

Loading

Keats commented Jan 22, 2024

Keats commented Mar 21, 2024

andrewbaxter commented Mar 23, 2024

fuch1m commented Apr 5, 2024

andrewbaxter commented Apr 5, 2024 •

edited

Loading

fuch1m commented Apr 6, 2024

fuch1m commented Apr 8, 2024

andrewbaxter commented Apr 9, 2024

WANG-lp commented Apr 23, 2024

Keats commented Apr 24, 2024

andrewbaxter commented Jun 12, 2024

Changes to support ACME, including JWS #359

Are you sure you want to change the base?

Changes to support ACME, including JWS #359

Conversation

andrewbaxter commented Jan 10, 2024

Keats left a comment

Choose a reason for hiding this comment

Keats Jan 10, 2024

Choose a reason for hiding this comment

andrewbaxter Jan 12, 2024

Choose a reason for hiding this comment

Keats Jan 13, 2024

Choose a reason for hiding this comment

Keats Jan 10, 2024

Choose a reason for hiding this comment

andrewbaxter Jan 12, 2024

Choose a reason for hiding this comment

gregparsons commented Jan 11, 2024

andrewbaxter commented Jan 11, 2024

andrewbaxter commented Jan 12, 2024

andrewbaxter commented Jan 14, 2024

Keats commented Jan 15, 2024 • edited Loading

randomairborne commented Jan 15, 2024

Keats commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

Keats commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024

andrewbaxter commented Jan 16, 2024 • edited Loading

randomairborne commented Jan 16, 2024 • edited Loading

andrewbaxter commented Jan 17, 2024

andrewbaxter commented Jan 17, 2024 • edited Loading

Keats commented Jan 22, 2024

Keats commented Mar 21, 2024

andrewbaxter commented Mar 23, 2024

fuch1m commented Apr 5, 2024

andrewbaxter commented Apr 5, 2024 • edited Loading

fuch1m commented Apr 6, 2024

fuch1m commented Apr 8, 2024

andrewbaxter commented Apr 9, 2024

WANG-lp commented Apr 23, 2024

Keats commented Apr 24, 2024

andrewbaxter commented Jun 12, 2024

Keats commented Jan 15, 2024 •

edited

Loading

andrewbaxter commented Jan 16, 2024 •

edited

Loading

randomairborne commented Jan 16, 2024 •

edited

Loading

andrewbaxter commented Jan 17, 2024 •

edited

Loading

andrewbaxter commented Apr 5, 2024 •

edited

Loading