Skip to content

Commit

Permalink
chore: Merge upstream (#5)
Browse files Browse the repository at this point in the history
* fix: Pass nonce and endpoint down to verification

Addressing openwallet-foundation#1163, we are now saving the nonce for presentations and
passing it along with the config endpoint down to the presentation
verification logic. This should begin verifying the KB-JWT, but I'm a
bit worried that the code may be fragile. I do not know the spec well
enough to know if the KB-JWT is required when the verifier passes a
nonce, or if it is completely optional.

This change effectively makes it required 100% of the time for
presentations.

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* fix: Credential creation request for SD-JWT

Apparently some changes had been made somewhere, breaking the demo. The
broken code in the demo has been changed and adapted to support the
changes that have occured within the OID4VC plugin.

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* chore: fix linting

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* fix: Move nonce to presentation

I originally thought I had put it on the presentation, but I stuck it on
the presentation definition instead. My bad, this change fixes that

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* fix: verify_credential & presentation signatures

Because changes have been made to the signature for SD-JWT's KB-JWT
work, changes have been made to the regular JWT class and the base
classes.

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* chore: line lengths

I thought I had got these, but the lines were still too long...

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* feat: Pass full presentation record to verifiers

Instead of passing down the nonce & aud parameters to the
verify_presentation method, pass down the entire presentation record
instead.

Since we're retrieving the AUD field from the profile's config, let's
just pull it out when we need it.

Also realized that verify_credential isn't even called from the route,
and so adding the presentation/nonce info may have broken whatever code
calls it (specifically in pex.py, which I did not modify and don't
understand how it works). Therefore, it was safer to remove it from the
signature.

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* chore: Fix linting

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /kafka_events (openwallet-foundation#1181)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump pydantic from 1.10.18 to 1.10.19 in /kafka_events (openwallet-foundation#1180)

Bumps [pydantic](https://github.com/pydantic/pydantic) from 1.10.18 to 1.10.19.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](pydantic/pydantic@v1.10.18...v1.10.19)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /connection_update (openwallet-foundation#1179)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff in /firebase_push_notifications (openwallet-foundation#1178)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /basicmessage_storage (openwallet-foundation#1176)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /plugin_globals (openwallet-foundation#1175)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /redis_events (openwallet-foundation#1174)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.7.2 to 0.7.3 in /rpc (openwallet-foundation#1173)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.7.2...0.7.3)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump google-auth in /firebase_push_notifications (openwallet-foundation#1177)

Bumps [google-auth](https://github.com/googleapis/google-auth-library-python) from 2.35.0 to 2.36.0.
- [Release notes](https://github.com/googleapis/google-auth-library-python/releases)
- [Changelog](https://github.com/googleapis/google-auth-library-python/blob/main/CHANGELOG.md)
- [Commits](googleapis/google-auth-library-python@v2.35.0...v2.36.0)

---
updated-dependencies:
- dependency-name: google-auth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: handle a None in provided sd_list properly

Signed-off-by: Micah Peltier <[email protected]>

* feat: add a deeply nested attribute to demo credential

Signed-off-by: Micah Peltier <[email protected]>

* fix: query presentations properly, formatting

Signed-off-by: Micah Peltier <[email protected]>

* fix: proper capitalization

Signed-off-by: Micah Peltier <[email protected]>

* chore: update poetry.lock files

Signed-off-by: Sownak Roy <[email protected]>

---------

Signed-off-by: Colton Wolkins (Laptop) <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Micah Peltier <[email protected]>
Signed-off-by: Sownak Roy <[email protected]>
Signed-off-by: Sownak Roy <[email protected]>
Co-authored-by: Colton Wolkins (Laptop) <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Micah Peltier <[email protected]>
  • Loading branch information
4 people authored Nov 19, 2024
1 parent 141cb8c commit 2870896
Show file tree
Hide file tree
Showing 38 changed files with 5,034 additions and 5,170 deletions.
6 changes: 3 additions & 3 deletions basicmessage_storage/integration/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

786 changes: 384 additions & 402 deletions basicmessage_storage/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion basicmessage_storage/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mergedeep = "^1.3.4"
aca-py = ["acapy-agent"]

[tool.poetry.dev-dependencies]
ruff = "^0.7.2"
ruff = "^0.7.3"
pytest = "^8.3.3"
pytest-asyncio = "^0.24.0"
pytest-cov = "^5.0.0"
Expand Down
6 changes: 3 additions & 3 deletions connection_update/integration/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

786 changes: 384 additions & 402 deletions connection_update/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion connection_update/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ acapy-agent = { version = "~1.1.0", optional = true }
aca-py = ["acapy-agent"]

[tool.poetry.dev-dependencies]
ruff = "^0.7.2"
ruff = "^0.7.3"
pytest = "^8.3.3"
pytest-asyncio = "^0.24.0"
pytest-cov = "^5.0.0"
Expand Down
6 changes: 3 additions & 3 deletions firebase_push_notifications/integration/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

845 changes: 415 additions & 430 deletions firebase_push_notifications/poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions firebase_push_notifications/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ python = "^3.12"
# explicitly installed with the plugin if desired.
acapy-agent = { version = "~1.1.0", optional = true }
marshmallow = "^3.20.1"
google-auth = "^2.33.0"
google-auth = "^2.36.0"
google-api-python-client = "^2.151.0"
requests = "^2.31.0"

[tool.poetry.extras]
aca-py = ["acapy-agent"]

[tool.poetry.dev-dependencies]
ruff = "^0.7.2"
ruff = "^0.7.3"
pytest = "^8.3.3"
pytest-asyncio = "^0.24.0"
pytest-cov = "^5.0.0"
Expand Down
214 changes: 116 additions & 98 deletions kafka_events/demo/setup/poetry.lock

Large diffs are not rendered by default.

463 changes: 214 additions & 249 deletions kafka_events/integration/poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions kafka_events/integration/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ authors = ["Daniel Bluhm <[email protected]>"]
license = "Apache-2.0"

[tool.poetry.dependencies]
python = "^3.9"
pytest = "^8.2.0"
python = "^3.12"
pytest = "^8.2.2"
pytest-asyncio = "~0.23.7"
requests = "^2.31.0"
requests = "^2.32.0"
pytest-cov = "^5.0.0"
acapy-client = {git="https://github.com/indicio-tech/acapy-client.git", branch="acapy/main"}
aiokafka = "^0.7.1"
Expand Down
23 changes: 13 additions & 10 deletions kafka_events/kafka_events/v1_0/deliverer/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2870896

Please sign in to comment.