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.

Sign up for GitHub

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

Jump to bottom

fix: delegations model tries to handle if row.bytes is Array not Buffer (e.g. cloudflare) #478

Merged
merged 4 commits into from
Mar 3, 2023
Merged

fix: delegations model tries to handle if row.bytes is Array not Buffer (e.g. cloudflare) #478

merged 4 commits into from
Mar 3, 2023

Conversation

gobengo
Copy link
Contributor

@gobengo gobengo commented Mar 3, 2023 •
edited
Loading

Rationale

This is the error I get from staging atm (on access/claim)

    claimResult {
      name: 'HandlerExecutionError',
      cause: {
        row: {
          cid: 'bafyreihqswtsrxvsp2pqf5a2jjiyb6zks3hynbfkhga7odwbat4ptxrf5e',
          bytes: [Array],
          issuer: 'did:mailto:dag.house:bengo',
          audience: 'did:key:z6MkkUymFxGqXWRqFNiaU4jCa2efexfDCNADqD7sQK3RbU2j',
          expiration: null,
          updated_at: '2023-03-03T16:41:54.999Z',
          inserted_at: '2023-03-03T16:41:54.999Z'
        },
        name: 'UnexpectedDelegation',
        stack: 'UnexpectedDelegation: failed to create delegation from row\n' +

Notably bytes is Array here.
Locally and in node.js, I think miniflare gives back a Buffer and (in nodejs) this catches it. But on cloudflare. This PR would cast the bytes column on delegations model to Uint8Array if the db/kysely hand it back as an Array.

@gobengo gobengo changed the title delegations model tries to handle if row.bytes is Array not Buffer (e.g. cloudflare) fix: delegations model tries to handle if row.bytes is Array not Buffer (e.g. cloudflare) Mar 3, 2023
@gobengo gobengo temporarily deployed to dev March 3, 2023 22:12 — with GitHub Actions Inactive
@gobengo @Gozala
Update packages/access-api/src/models/delegations.js
e9cf40c 
Co-authored-by: Irakli Gozalishvili <contact@gozala.io>
@gobengo gobengo temporarily deployed to dev March 3, 2023 22:29 — with GitHub Actions Inactive
@gobengo gobengo merged commit 030e7b7 into main Mar 3, 2023
@gobengo gobengo deleted the bytescol branch March 3, 2023 22:30
@it-dag-house it-dag-house mentioned this pull request Mar 3, 2023
Closed
@gobengo gobengo mentioned this pull request Mar 3, 2023
Closed
alanshaw
alanshaw reviewed Mar 6, 2023
View reviewed changes
packages/access-api/src/models/delegations.js
@@ -162,3 +162,20 @@ export function createDelegationRowUpdate(d) {
bytes: delegationsToBytes([d]),
}
}

/**
* @param {Array<number> | Buffer | unknown} sqlValue - value from kysely 'bytes' table - in node it could be a Buffer. In cloudflare it might be an Array
Copy link
Member

Choose a reason for hiding this comment

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

value from kysely 'bytes' table

Not sure I understand this comment! Isn't kysely the client? What is a "bytes" table?

This was referenced Mar 21, 2023
Closed
Merged
alanshaw pushed a commit that referenced this pull request Mar 23, 2023
@it-dag-house
chore(main): release access-api 5.0.0 (#588)
c0fb10a 
🤖 I have created a release *beep* *boop*
---


##
[5.0.0](access-api-v4.11.0...access-api-v5.0.0)
(2023-03-23)


### ⚠ BREAKING CHANGES

* implement new account-based multi-device flow
([#433](#433))
* upgrade capabilities to latest ucanto
([#463](#463))

### Features

* access-api handles provider/add invocations
([#462](#462))
([5fb56f7](5fb56f7))
* access-api serves access/claim invocations
([#456](#456))
([baacf35](baacf35))
* access/authorize confirmation email click results in a delegation back
to the issuer did:key so that access/claim works
([#460](#460))
([a466a7d](a466a7d))
* allow multiple providers
([#595](#595))
([96c5a2e](96c5a2e))
* define `access/confirm` handler and use it in ucanto-test-utils
registerSpaces + validate-email handler
([#530](#530))
([b1bbc90](b1bbc90))
* handle access/delegate invocations without error
([#427](#427))
([4f0bd1c](4f0bd1c))
* if POST /validate-email?mode=authorize catches error w/ too big qr
code ([#516](#516))
([d0df525](d0df525))
* implement new account-based multi-device flow
([#433](#433))
([1ddc6a0](1ddc6a0))
* includes proofs chains in the delegated authorization chain
([#467](#467))
([5144293](5144293))
* move access-api delegation bytes out of d1 and into r2
([#578](#578))
([4510c9a](4510c9a))
* move validation flow to a Durable Object to make it ⏩ fast ⏩ fast ⏩
fast ⏩ ([#449](#449))
([02d7552](02d7552))
* provision provider type is now the DID of the w3s service
([#528](#528))
([6a72855](6a72855))
* space/info will not error for spaces that have had storage provider
added via provider/add
([#510](#510))
([ea4e872](ea4e872))
* upgrade capabilities to latest ucanto
([#463](#463))
([2d786ee](2d786ee))
* upgrade to new ucanto
([#498](#498))
([dcb41a9](dcb41a9))
* write invocations and receipts into ucan log
([#592](#592))
([754bf52](754bf52))


### Bug Fixes

* access/delegate checks hasStorageProvider(space) in a way that
provider/add allows access/delegate
([#483](#483))
([f4c640d](f4c640d))
* adjust migration 0005 to keep delegations table but create new used
delegations_v2
([#469](#469))
([a205ad1](a205ad1))
* adjust migration 0005 to not do a drop table and instead rename
delegations -&gt; delegations_old and create a new delegations
([#468](#468))
([6c8242d](6c8242d))
* allow injecting email
([#466](#466))
([e19847f](e19847f))
* DbDelegationsStorage#find throws UnexpectedDelegation w/ { row } if
failed bytesToDelegations
([#476](#476))
([a6dafcb](a6dafcb))
* DbProvisionsStorage putMany doesnt error on cid col conflict
([#517](#517))
([c1fea63](c1fea63))
* delegations model tries to handle if row.bytes is Array not Buffer
(e.g. cloudflare)
([#478](#478))
([030e7b7](030e7b7))


### Miscellaneous Chores

* **access-client:** release 11.0.0-rc.0
([#573](#573))
([be4386d](be4386d))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
@it-dag-house it-dag-house mentioned this pull request Mar 23, 2023
Closed
gobengo added a commit that referenced this pull request Apr 11, 2023
@gobengo @Gozala
fix: delegations model tries to handle if row.bytes is Array not Buff…
02c0c28 
…er (e.g. cloudflare) (#478)

## Rationale

This is the error I get from staging atm (on `access/claim`)

```
    claimResult {
      name: 'HandlerExecutionError',
      cause: {
        row: {
          cid: 'bafyreihqswtsrxvsp2pqf5a2jjiyb6zks3hynbfkhga7odwbat4ptxrf5e',
          bytes: [Array],
          issuer: 'did:mailto:dag.house:bengo',
          audience: 'did:key:z6MkkUymFxGqXWRqFNiaU4jCa2efexfDCNADqD7sQK3RbU2j',
          expiration: null,
          updated_at: '2023-03-03T16:41:54.999Z',
          inserted_at: '2023-03-03T16:41:54.999Z'
        },
        name: 'UnexpectedDelegation',
        stack: 'UnexpectedDelegation: failed to create delegation from row\n' +
```

Notably `bytes` is `Array` here.
Locally and in node.js, I think miniflare gives back a `Buffer` and (in
nodejs) [this catches
it](https://github.com/web3-storage/w3protocol/blob/660f773c5d52eaaba9b7177932edb0e92942dde7/packages/access-api/src/utils/d1.js#L77).
But on cloudflare. This PR would cast the bytes column on delegations
model to Uint8Array if the db/kysely hand it back as an Array.

---------

Co-authored-by: Irakli Gozalishvili <contact@gozala.io>
gobengo pushed a commit that referenced this pull request Apr 11, 2023
@it-dag-house
chore(main): release access-api 5.0.0 (#588)
1230e7e 
🤖 I have created a release *beep* *boop*
---


##
[5.0.0](access-api-v4.11.0...access-api-v5.0.0)
(2023-03-23)


### ⚠ BREAKING CHANGES

* implement new account-based multi-device flow
([#433](#433))
* upgrade capabilities to latest ucanto
([#463](#463))

### Features

* access-api handles provider/add invocations
([#462](#462))
([46da0df](46da0df))
* access-api serves access/claim invocations
([#456](#456))
([2ec16e9](2ec16e9))
* access/authorize confirmation email click results in a delegation back
to the issuer did:key so that access/claim works
([#460](#460))
([fc62691](fc62691))
* allow multiple providers
([#595](#595))
([aba57b3](aba57b3))
* define `access/confirm` handler and use it in ucanto-test-utils
registerSpaces + validate-email handler
([#530](#530))
([a08b513](a08b513))
* handle access/delegate invocations without error
([#427](#427))
([db01d07](db01d07))
* if POST /validate-email?mode=authorize catches error w/ too big qr
code ([#516](#516))
([ab83b19](ab83b19))
* implement new account-based multi-device flow
([#433](#433))
([6152e55](6152e55))
* includes proofs chains in the delegated authorization chain
([#467](#467))
([743a72f](743a72f))
* move access-api delegation bytes out of d1 and into r2
([#578](#578))
([3029e4a](3029e4a))
* move validation flow to a Durable Object to make it ⏩ fast ⏩ fast ⏩
fast ⏩ ([#449](#449))
([3868d97](3868d97))
* provision provider type is now the DID of the w3s service
([#528](#528))
([4cd6cd9](4cd6cd9))
* space/info will not error for spaces that have had storage provider
added via provider/add
([#510](#510))
([362024f](362024f))
* upgrade capabilities to latest ucanto
([#463](#463))
([e375ae4](e375ae4))
* upgrade to new ucanto
([#498](#498))
([790750d](790750d))
* write invocations and receipts into ucan log
([#592](#592))
([d52a281](d52a281))


### Bug Fixes

* access/delegate checks hasStorageProvider(space) in a way that
provider/add allows access/delegate
([#483](#483))
([1d3d562](1d3d562))
* adjust migration 0005 to keep delegations table but create new used
delegations_v2
([#469](#469))
([d90825a](d90825a))
* adjust migration 0005 to not do a drop table and instead rename
delegations -&gt; delegations_old and create a new delegations
([#468](#468))
([89f2acd](89f2acd))
* allow injecting email
([#466](#466))
([b4b0173](b4b0173))
* DbDelegationsStorage#find throws UnexpectedDelegation w/ { row } if
failed bytesToDelegations
([#476](#476))
([660f773](660f773))
* DbProvisionsStorage putMany doesnt error on cid col conflict
([#517](#517))
([8c6dea8](8c6dea8))
* delegations model tries to handle if row.bytes is Array not Buffer
(e.g. cloudflare)
([#478](#478))
([02c0c28](02c0c28))


### Miscellaneous Chores

* **access-client:** release 11.0.0-rc.0
([#573](#573))
([29daa02](29daa02))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alanshaw alanshaw alanshaw left review comments

@Gozala Gozala Gozala approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gobengo @Gozala @alanshaw