Page MenuHomePhabricator
Differential D7617

[web][native] Support fetching Blob service URIs
ClosedPublic
Actions

Authored by bartek on Apr 25 2023, 11:10 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 4:45 PM
Unknown Object (File)
Tue, Mar 11, 11:46 AM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
Unknown Object (File)
Wed, Mar 5, 9:34 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
atul
marcin
ginsu
rohan
Commits
rCOMM6a00d81adcd8: [web][native] Support fetching Blob service URIs
Summary

This diff adds support for fetching Blob service URIs for the native and web.

Depends on D7616

Test Plan

Uploaded both encrypted and non-encrypted blob to local blob service instance.
Amended the keyserver's upload-fetchers to return these Blob URIs.
Verified media is fetched and displayed correctly both on web and native.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bartek created this revision.Apr 25 2023, 11:10 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptApr 25 2023, 11:10 AM
bartek added a child revision: D7618: [keyserver] Support external blobs in uploads table.Apr 25 2023, 11:18 AM
Harbormaster completed remote builds in B18751: Diff 25691.Apr 25 2023, 11:29 AM
bartek updated this revision to Diff 25695.Apr 25 2023, 11:38 AM

Fix missing diff after rebasing

bartek published this revision for review.Apr 25 2023, 11:44 AM
bartek added inline comments.
web/media/media-utils.js
206–207 ↗(On Diff #25695)
web/media/multimedia-modal.react.js
46–52 ↗(On Diff #25695)

This adds support for hosting non-encrypted media on Blob service.
I plan to use Blob service for uploading encrypted media only, but it won't hurt to support this here just in case.

This is also compatible with my changes from D7618 where, in theory, blob URI can be returned regardless of media type.

Harbormaster completed remote builds in B18755: Diff 25695.Apr 25 2023, 11:58 AM
bartek mentioned this in D7616: [lib] Shim Blob service hosted multimedia.Apr 25 2023, 9:25 PM
bartek updated this revision to Diff 25806.Apr 27 2023, 3:47 AM

Rebase

Harbormaster completed remote builds in B18837: Diff 25806.Apr 27 2023, 4:04 AM
bartek updated this revision to Diff 25933.Apr 29 2023, 8:48 AM

Add missing error check

Harbormaster completed remote builds in B18934: Diff 25933.Apr 29 2023, 9:05 AM
atul accepted this revision.May 3 2023, 9:26 AM

Uploaded both encrypted and non-encrypted blob to local blob service instance. Amended the keyserver's upload-fetchers to return these Blob URIs. Verified media is fetched and displayed correctly both on web and native.

Would there be a good way for a reviewer to test this in their local environment?

native/media/encryption-utils.js
272

We often use snake_cased error messages

EG

980e6b.png (1×848 px, 256 KB)

and can handle them conditionally in any outer catch blocks

EG

db863b.png (290×990 px, 66 KB)

would it make sense to do something similar here? Maybe throw different errors based on status/statusText?

Will leave it up to you since you have more context on what type of errors we might encounter, etc.

web/media/media-utils.js
202–205

Looks like we have similar logic in identifier-utils.

Up to you, but might make sense to consolidate at some point in the future if we re-use further?

web/media/multimedia-modal.react.js
49

Could we move this above media.type === 'photo' check?

This revision is now accepted and ready to land.May 3 2023, 9:26 AM
atul attached a referenced file: F520940: db863b.png. (Show Details)May 3 2023, 9:26 AM
atul attached a referenced file: F520938: 980e6b.png. (Show Details)
atul mentioned this in D7649: [native] Add function to upload media to blob service.May 3 2023, 10:57 AM
bartek added inline comments.May 7 2023, 10:10 PM
native/media/encryption-utils.js
272

This is a good idea, worth thinking of more thoroughly. I'll make a Linear task for this

web/media/media-utils.js
202–205

Yeah, good idea, not sure why I didn't do it in the first place

web/media/multimedia-modal.react.js
49

Already tried that, Flow complains

bartek added inline comments.May 8 2023, 12:11 AM
native/media/encryption-utils.js
272

https://linear.app/comm/issue/ENG-3841/rethink-error-responses-for-blob-service

bartek updated this revision to Diff 26145.May 8 2023, 12:40 AM

Extracted common 'fetchableMediaURI' function

Harbormaster completed remote builds in B19096: Diff 26145.May 8 2023, 12:57 AM
bartek updated this revision to Diff 26174.May 8 2023, 4:02 AM

Rebase before landing

Harbormaster completed remote builds in B19120: Diff 26174.May 8 2023, 4:21 AM
Closed by commit rCOMM6a00d81adcd8: [web][native] Support fetching Blob service URIs (authored by bartek). · Explain WhyMay 8 2023, 4:47 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMM6a00d81adcd8: [web][native] Support fetching Blob service URIs.
bartek mentioned this in D7689: [web] Add function to upload media to Blob service.May 9 2023, 4:57 AM

Revision Contents
Changeset List

Diff 25933

View Options

native/media/encryption-utils.js

syntax = "proto3"; syntax = "proto3";
package identity; package identity;
service IdentityService { service IdentityService {
rpc AuthenticateUser(stream AuthenticationRequest) returns (stream AuthenticationResponse) {} // Called by user to register with the Identity Service (PAKE only)
rpc RegisterUser(stream RegistrationRequest) returns (RegistrationResponse) {}
// Called by user to create an active session and get an access token
rpc LoginUser(stream LoginRequest) returns (LoginResponse) {}
// Called by other services to get a user's token
rpc GetUserToken(GetUserTokenRequest) returns (GetUserTokenResponse) {}
} }
// Helper types // Helper types
message PakeRegistrationRequestAndUserID { message PakeRegistrationRequestAndUserID {
string userID = 1; string userID = 1;
bytes pakeRegistrationRequest = 2; bytes pakeRegistrationRequest = 2;
} }
message PakeAuthenticationRequestData { message pakeCredentialRequestAndUserID {
string userID = 1;
bytes pakeCredentialRequest = 2;
}
message PakeLoginRequest {
oneof data { oneof data {
PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1; pakeCredentialRequestAndUserID pakeCredentialRequestAndUserID = 1;
bytes pakeRegistrationUpload = 2; bytes pakeCredentialFinalization = 2;
bytes pakeCredentialRequest = 3;
bytes pakeCredentialFinalization = 4;
bytes pakeClientMAC = 5;
} }
} }
message WalletAuthenticationRequestData { message PakeLoginResponse {
bytes pakeCredentialResponse = 1;
}
message WalletLoginRequest {
string userID = 1; string userID = 1;
string walletAddress = 2; string walletAddress = 2;
bytes signedMessage = 3; bytes signedMessage = 3;
} }
message WalletAuthenticationResponseData { message WalletLoginResponse {
bool success = 1; bytes token = 1;
} }
message PakeAuthenticationResponseData { // RegisterUser
message RegistrationRequest {
oneof data { oneof data {
bytes pakeRegistrationResponse = 1; PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1;
bool pakeRegistrationSuccess = 2; bytes pakeRegistrationUpload = 2;
bytes pakeCredentialResponse = 3;
bytes pakeServerMAC = 4;
} }
} }
// AuthenticateUser message RegistrationResponse {
bytes pakeRegistrationResponse = 1;
}
// LoginUser
message AuthenticationRequest { message LoginRequest {
oneof data { oneof data {
PakeAuthenticationRequestData pakeAuthenticationRequestData = 1; PakeLoginRequest pakeLoginRequest = 1;
WalletAuthenticationRequestData walletAuthenticationRequestData = 2; WalletLoginRequest walletLoginRequest = 2;
} }
} }
message AuthenticationResponse { message LoginResponse {
oneof data { oneof data {
PakeAuthenticationResponseData pakeAuthenticationResponseData = 1; PakeLoginResponse pakeLoginResponse = 1;
WalletAuthenticationResponseData walletAuthenticationResponseData = 2; WalletLoginResponse walletLoginResponse = 2;
} }
} }
// GetUserToken
message GetUserTokenRequest {
string userID = 1;
}
message GetUserTokenResponse {
bytes token = 2;
}
/**
* Database - Structure:
* token
* userID[PK] string
* created timestamp
* token bytes
* registrationData bytes
* valid boolean
*/
/**
* Database - Description:
* token - tokens assigned to users along with the data necessary to retrieve
* them
* `created` - when the token was created
* `registrationData` - serialized data described by one of the
* following structures
* { authType: 'password', pakePasswordCiphertext: string }
* { authType: 'wallet', walletAddress: string }
* `valid` - false if the token has been revoked
*/
View Options

native/media/identifier-utils.js

syntax = "proto3"; syntax = "proto3";
package identity; package identity;
service IdentityService { service IdentityService {
rpc AuthenticateUser(stream AuthenticationRequest) returns (stream AuthenticationResponse) {} // Called by user to register with the Identity Service (PAKE only)
rpc RegisterUser(stream RegistrationRequest) returns (RegistrationResponse) {}
// Called by user to create an active session and get an access token
rpc LoginUser(stream LoginRequest) returns (LoginResponse) {}
// Called by other services to get a user's token
rpc GetUserToken(GetUserTokenRequest) returns (GetUserTokenResponse) {}
} }
// Helper types // Helper types
message PakeRegistrationRequestAndUserID { message PakeRegistrationRequestAndUserID {
string userID = 1; string userID = 1;
bytes pakeRegistrationRequest = 2; bytes pakeRegistrationRequest = 2;
} }
message PakeAuthenticationRequestData { message pakeCredentialRequestAndUserID {
string userID = 1;
bytes pakeCredentialRequest = 2;
}
message PakeLoginRequest {
oneof data { oneof data {
PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1; pakeCredentialRequestAndUserID pakeCredentialRequestAndUserID = 1;
bytes pakeRegistrationUpload = 2; bytes pakeCredentialFinalization = 2;
bytes pakeCredentialRequest = 3;
bytes pakeCredentialFinalization = 4;
bytes pakeClientMAC = 5;
} }
} }
message WalletAuthenticationRequestData { message PakeLoginResponse {
bytes pakeCredentialResponse = 1;
}
message WalletLoginRequest {
string userID = 1; string userID = 1;
string walletAddress = 2; string walletAddress = 2;
bytes signedMessage = 3; bytes signedMessage = 3;
} }
message WalletAuthenticationResponseData { message WalletLoginResponse {
bool success = 1; bytes token = 1;
} }
message PakeAuthenticationResponseData { // RegisterUser
message RegistrationRequest {
oneof data { oneof data {
bytes pakeRegistrationResponse = 1; PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1;
bool pakeRegistrationSuccess = 2; bytes pakeRegistrationUpload = 2;
bytes pakeCredentialResponse = 3;
bytes pakeServerMAC = 4;
} }
} }
// AuthenticateUser message RegistrationResponse {
bytes pakeRegistrationResponse = 1;
}
// LoginUser
message AuthenticationRequest { message LoginRequest {
oneof data { oneof data {
PakeAuthenticationRequestData pakeAuthenticationRequestData = 1; PakeLoginRequest pakeLoginRequest = 1;
WalletAuthenticationRequestData walletAuthenticationRequestData = 2; WalletLoginRequest walletLoginRequest = 2;
} }
} }
message AuthenticationResponse { message LoginResponse {
oneof data { oneof data {
PakeAuthenticationResponseData pakeAuthenticationResponseData = 1; PakeLoginResponse pakeLoginResponse = 1;
WalletAuthenticationResponseData walletAuthenticationResponseData = 2; WalletLoginResponse walletLoginResponse = 2;
} }
} }
// GetUserToken
message GetUserTokenRequest {
string userID = 1;
}
message GetUserTokenResponse {
bytes token = 2;
}
/**
* Database - Structure:
* token
* userID[PK] string
* created timestamp
* token bytes
* registrationData bytes
* valid boolean
*/
/**
* Database - Description:
* token - tokens assigned to users along with the data necessary to retrieve
* them
* `created` - when the token was created
* `registrationData` - serialized data described by one of the
* following structures
* { authType: 'password', pakePasswordCiphertext: string }
* { authType: 'wallet', walletAddress: string }
* `valid` - false if the token has been revoked
*/
View Options

web/media/encryption-utils.js

syntax = "proto3"; syntax = "proto3";
package identity; package identity;
service IdentityService { service IdentityService {
rpc AuthenticateUser(stream AuthenticationRequest) returns (stream AuthenticationResponse) {} // Called by user to register with the Identity Service (PAKE only)
rpc RegisterUser(stream RegistrationRequest) returns (RegistrationResponse) {}
// Called by user to create an active session and get an access token
rpc LoginUser(stream LoginRequest) returns (LoginResponse) {}
// Called by other services to get a user's token
rpc GetUserToken(GetUserTokenRequest) returns (GetUserTokenResponse) {}
} }
// Helper types // Helper types
message PakeRegistrationRequestAndUserID { message PakeRegistrationRequestAndUserID {
string userID = 1; string userID = 1;
bytes pakeRegistrationRequest = 2; bytes pakeRegistrationRequest = 2;
} }
message PakeAuthenticationRequestData { message pakeCredentialRequestAndUserID {
string userID = 1;
bytes pakeCredentialRequest = 2;
}
message PakeLoginRequest {
oneof data { oneof data {
PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1; pakeCredentialRequestAndUserID pakeCredentialRequestAndUserID = 1;
bytes pakeRegistrationUpload = 2; bytes pakeCredentialFinalization = 2;
bytes pakeCredentialRequest = 3;
bytes pakeCredentialFinalization = 4;
bytes pakeClientMAC = 5;
} }
} }
message WalletAuthenticationRequestData { message PakeLoginResponse {
bytes pakeCredentialResponse = 1;
}
message WalletLoginRequest {
string userID = 1; string userID = 1;
string walletAddress = 2; string walletAddress = 2;
bytes signedMessage = 3; bytes signedMessage = 3;
} }
message WalletAuthenticationResponseData { message WalletLoginResponse {
bool success = 1; bytes token = 1;
} }
message PakeAuthenticationResponseData { // RegisterUser
message RegistrationRequest {
oneof data { oneof data {
bytes pakeRegistrationResponse = 1; PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1;
bool pakeRegistrationSuccess = 2; bytes pakeRegistrationUpload = 2;
bytes pakeCredentialResponse = 3;
bytes pakeServerMAC = 4;
} }
} }
// AuthenticateUser message RegistrationResponse {
bytes pakeRegistrationResponse = 1;
}
// LoginUser
message AuthenticationRequest { message LoginRequest {
oneof data { oneof data {
PakeAuthenticationRequestData pakeAuthenticationRequestData = 1; PakeLoginRequest pakeLoginRequest = 1;
WalletAuthenticationRequestData walletAuthenticationRequestData = 2; WalletLoginRequest walletLoginRequest = 2;
} }
} }
message AuthenticationResponse { message LoginResponse {
oneof data { oneof data {
PakeAuthenticationResponseData pakeAuthenticationResponseData = 1; PakeLoginResponse pakeLoginResponse = 1;
WalletAuthenticationResponseData walletAuthenticationResponseData = 2; WalletLoginResponse walletLoginResponse = 2;
} }
} }
// GetUserToken
message GetUserTokenRequest {
string userID = 1;
}
message GetUserTokenResponse {
bytes token = 2;
}
/**
* Database - Structure:
* token
* userID[PK] string
* created timestamp
* token bytes
* registrationData bytes
* valid boolean
*/
/**
* Database - Description:
* token - tokens assigned to users along with the data necessary to retrieve
* them
* `created` - when the token was created
* `registrationData` - serialized data described by one of the
* following structures
* { authType: 'password', pakePasswordCiphertext: string }
* { authType: 'wallet', walletAddress: string }
* `valid` - false if the token has been revoked
*/
View Options

web/media/media-utils.js

syntax = "proto3"; syntax = "proto3";
package identity; package identity;
service IdentityService { service IdentityService {
rpc AuthenticateUser(stream AuthenticationRequest) returns (stream AuthenticationResponse) {} // Called by user to register with the Identity Service (PAKE only)
rpc RegisterUser(stream RegistrationRequest) returns (RegistrationResponse) {}
// Called by user to create an active session and get an access token
rpc LoginUser(stream LoginRequest) returns (LoginResponse) {}
// Called by other services to get a user's token
rpc GetUserToken(GetUserTokenRequest) returns (GetUserTokenResponse) {}
} }
// Helper types // Helper types
message PakeRegistrationRequestAndUserID { message PakeRegistrationRequestAndUserID {
string userID = 1; string userID = 1;
bytes pakeRegistrationRequest = 2; bytes pakeRegistrationRequest = 2;
} }
message PakeAuthenticationRequestData { message pakeCredentialRequestAndUserID {
string userID = 1;
bytes pakeCredentialRequest = 2;
}
message PakeLoginRequest {
oneof data { oneof data {
PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1; pakeCredentialRequestAndUserID pakeCredentialRequestAndUserID = 1;
bytes pakeRegistrationUpload = 2; bytes pakeCredentialFinalization = 2;
bytes pakeCredentialRequest = 3;
bytes pakeCredentialFinalization = 4;
bytes pakeClientMAC = 5;
} }
} }
message WalletAuthenticationRequestData { message PakeLoginResponse {
bytes pakeCredentialResponse = 1;
}
message WalletLoginRequest {
string userID = 1; string userID = 1;
string walletAddress = 2; string walletAddress = 2;
bytes signedMessage = 3; bytes signedMessage = 3;
} }
message WalletAuthenticationResponseData { message WalletLoginResponse {
bool success = 1; bytes token = 1;
} }
message PakeAuthenticationResponseData { // RegisterUser
message RegistrationRequest {
oneof data { oneof data {
bytes pakeRegistrationResponse = 1; PakeRegistrationRequestAndUserID pakeRegistrationRequestAndUserID = 1;
bool pakeRegistrationSuccess = 2; bytes pakeRegistrationUpload = 2;
bytes pakeCredentialResponse = 3;
bytes pakeServerMAC = 4;
} }
} }
// AuthenticateUser message RegistrationResponse {
bytes pakeRegistrationResponse = 1;
}
// LoginUser
message AuthenticationRequest { message LoginRequest {
oneof data { oneof data {
PakeAuthenticationRequestData pakeAuthenticationRequestData = 1; PakeLoginRequest pakeLoginRequest = 1;
WalletAuthenticationRequestData walletAuthenticationRequestData = 2; WalletLoginRequest walletLoginRequest = 2;
} }
} }
message AuthenticationResponse { message LoginResponse {
oneof data { oneof data {
PakeAuthenticationResponseData pakeAuthenticationResponseData = 1; PakeLoginResponse pakeLoginResponse = 1;
WalletAuthenticationResponseData walletAuthenticationResponseData = 2; WalletLoginResponse walletLoginResponse = 2;
} }
} }
// GetUserToken
message GetUserTokenRequest {
string userID = 1;
}
message GetUserTokenResponse {
bytes token = 2;
}
/**
* Database - Structure:
* token
* userID[PK] string
* created timestamp
* token bytes
* registrationData bytes
* valid boolean
*/
/**
* Database - Description:
* token - tokens assigned to users along with the data necessary to retrieve
* them
* `created` - when the token was created
* `registrationData` - serialized data described by one of the
* following structures
* { authType: 'password', pakePasswordCiphertext: string }
* { authType: 'wallet', walletAddress: string }
* `valid` - false if the token has been revoked
*/
View Options

web/media/multimedia-modal.react.js

Loading...
View Options

web/media/multimedia.react.js

Loading...