Skip to content

feat(ocm): sign responses with request binding - #66633

Open
mickenordin wants to merge 2 commits into
masterfrom
kano-sign-response
Open

mickenordin wants to merge 2 commits into
masterfrom
kano-sign-response

Conversation

@mickenordin

@mickenordin mickenordin commented Nov 15, 2026 •

Copy link
Copy Markdown
Contributor

Summary

This PR adds the ability to sign responses with RFC9421 signatures. This is required for federated groups. As such it works together with: #66049 that also adds a foundational piece for federated groups as well as #66642. In particular, the key package of OCM-MLS endpoint needs to sign responses.

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@mickenordin mickenordin added this to the Nextcloud 36 milestone Nov 15, 2026
@mickenordin
mickenordin requested review from a team and nickvergessen as code owners November 15, 2026 22:14
@mickenordin mickenordin added 3. to review Waiting for reviews community pull requests from community labels Nov 15, 2026
@mickenordin
mickenordin requested review from icewind1991 and provokateurin and removed request for a team November 15, 2026 22:14
@mickenordin
mickenordin marked this pull request as draft November 15, 2026 22:58
@mickenordin
mickenordin force-pushed the kano-sign-response branch 2 times, most recently from 19ae1e9 to 33a474e Compare November 16, 2026 10:25
@mickenordin
mickenordin marked this pull request as ready for review November 16, 2026 10:25
@mickenordin

mickenordin commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor Author

This is the result:

GET https://cloud-a.test:8443/index.php/ocm/mls-key-packages?userId=admin%40cloud-a.test%3A8443&senderDomain=cloud-b.test%3A8443
Content-Digest: sha-256=:T1PNoYwrqgwDVLtfmj7L5e0Sq02OEbqHPC8RFhICuUU=:
Content-Length: 2
Signature-Input: ocm=("@method" "@target-uri" "content-digest" "content-length");created=1794826021;keyid="https://cloud-b.localhost:8443/ocm#ecdsa-p256-sha256-1";nonce="b08466ad0dafd683544f1e86747aa247";tag="ocm"
Signature: ocm=:XAVEoHPzS+Rd5hqmYRPF0EOffSzoTBmLDKWnv5nyvwmJyGu3TNdNDClQFWlVdfmuxVPYpSzfc588mffmYsVIww==:

HTTP 200
Content-Type: application/json; charset=utf-8
Content-Digest: sha-256=:a+OvqEMvk4o+bAFfNFiMKONojBSKV3En1O0eXOAZu00=:
Signature-Input: ocm=("@status" "content-type" "content-digest" "@method";req "@target-uri";req "signature-input";req);created=1794826022;keyid="https://cloud-a.test:8443/ocm#ecdsa-p256-sha256-1";tag="ocm"
Signature: ocm=:N9IyZYbNb0cAh2ix/Yyrg8Peica1qeYsGiFigKruuW3jAJtGQSj+2BPi2LiGwr+9wzHHhPhV+Tl3IqqPOGYwKQ==:

Response body
{
    "userId": "admin@cloud-a.test:8443",
    "keyPackages": [
        {
            "mediaType": "message/mls",
            "encoding": "base64url",
            "content": "AAEAASBYKj-UfeiYDT2kpihs7HPViA6gt6KcK3X8_QJK44eSaiBW7eDfcIg0vitAmcE8YmejayT2AjL8HwvdcbTkYLU4HyDJsB-5kMbArqC7XNsfkREzowkCBCJk7Hdw8FhnS1xvmgABF2FkbWluQGNsb3VkLWEudGVzdDo4NDQzAgABAgABAgAGAgAIAgABAQAAAABq-s9TAAAAAGsECdMKAAYHBgABAwIABkBAX4XHyHBxnEX4fWer7hfqvixfuSsFbRGPB2qeQL_dmpvHOblOKaU7RfnDo3dvGM8nFGdUNiGPS4nEZ3iSTVGBCgBAQKw-IF-riLVcMxvJ5dX0sLUs5uDbZBcOAsah_UDoSKBuhtkoJ4W-F3wozWF4QAGIQzKVQWv44VeNDhcdjNWWvw4"
        }
    ]
}

KeyPackage (base64url)
AAEAASBYKj-UfeiYDT2kpihs7HPViA6gt6KcK3X8_QJK44eSaiBW7eDfcIg0vitAmcE8YmejayT2AjL8HwvdcbTkYLU4HyDJsB-5kMbArqC7XNsfkREzowkCBCJk7Hdw8FhnS1xvmgABF2FkbWluQGNsb3VkLWEudGVzdDo4NDQzAgABAgABAgAGAgAIAgABAQAAAABq-s9TAAAAAGsECdMKAAYHBgABAwIABkBAX4XHyHBxnEX4fWer7hfqvixfuSsFbRGPB2qeQL_dmpvHOblOKaU7RfnDo3dvGM8nFGdUNiGPS4nEZ3iSTVGBCgBAQKw-IF-riLVcMxvJ5dX0sLUs5uDbZBcOAsah_UDoSKBuhtkoJ4W-F3wozWF4QAGIQzKVQWv44VeNDhcdjNWWvw4

KeyPackage (hex)
0001000120582a3f947de8980d3da4a6286cec73d5880ea0b7a29c2b75fcfd024ae387926a2056ede0df708834be2b4099c13c6267a36b24f60232fc1f0bdd71b4e460b5381f20c9b01fb990c6c0aea0bb5cdb1f911133a30902042264ec7770f058674b5c6f9a00011761646d696e40636c6f75642d612e746573743a3834343302000102000102000602000802000101000000006afacf53000000006b0409d30a0006070600010302000640405f85c7c870719c45f87d67abee17eabe2c5fb92b056d118f076a9e40bfdd9a9bc739b94e29a53b45f9c3a3776f18cf2714675436218f4b89c46778924d51810a004040ac3e205fab88b55c331bc9e5d5f4b0b52ce6e0db64170e02c6a1fd40e848a06e86d9282785be177c28cd6178400188433295416bf8e1578d0e171d8cd596bf0e

KeyPackage (decoded)
{
    "byteLength": 305,
    "sha256": "078949b33a5533ec28ea5ddcae6db0801d9023158bb1487a35d897d255b59c05",
    "protocolVersion": 1,
    "cipherSuite": "0x0001",
    "initKey": "WCo_lH3omA09pKYobOxz1YgOoLeinCt1_P0CSuOHkmo",
    "leafEncryptionKey": "Vu3g33CINL4rQJnBPGJno2sk9gIy_B8L3XG05GC1OB8",
    "leafSignatureKey": "ybAfuZDGwK6gu1zbH5ERM6MJAgQiZOx3cPBYZ0tcb5o",
    "credentialType": 1,
    "credentialIdentity": "admin@cloud-a.test:8443",
    "leafSource": "KEY_PACKAGE",
    "notBefore": 1794821971,
    "notAfter": 1795426771,
    "keyPackageExtensions": [],
    "leafExtensions": [
        "0x0006"
    ],
    "keyPackageSignature": "rD4gX6uItVwzG8nl1fSwtSzm4NtkFw4CxqH9QOhIoG6G2Sgnhb4XfCjNYXhAAYhDMpVBa_jhV40OFx2M1Za_Dg",
    "leafSignature": "X4XHyHBxnEX4fWer7hfqvixfuSsFbRGPB2qeQL_dmpvHOblOKaU7RfnDo3dvGM8nFGdUNiGPS4nEZ3iSTVGBCg"
}

This was produced by: https://code.smolnet.org/micke/federated_groups

@nickvergessen

Copy link
Copy Markdown
Member

Forgot to add my review comment. I ran an AI review on the PR looks mostly good, but it reads like there are some bugs that should be addressed before merging

@mickenordin

Copy link
Copy Markdown
Contributor Author

Forgot to add my review comment. I ran an AI review on the PR looks mostly good, but it reads like there are some bugs that should be addressed before merging

I will address these findings!

Assisted-by: OpenCode:gpt-daybreak-blue-latest
Signed-off-by: Micke Nordin <kano@sunet.se>
- throw SignatureException (400 + throttle) instead of
  InvalidArgumentException (500) on malformed component identifiers
- bind responses to the request via "signature";key="ocm";req and cover
  only the ocm entry of Signature-Input ("signature-input";key="ocm";req)
- sign lazily at send time and re-sign when status/headers change
- allow signing non-200/non-JSON responses via status/contentType params
- share target-uri reconstruction and signing logic in SignatureBase

Assisted-by: OpenCode:mistral-large-latest
Signed-off-by: Micke Nordin <kano@sunet.se>
@mickenordin

Copy link
Copy Markdown
Contributor Author

I think it should be fixed now.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews AI assisted community pull requests from community

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants