mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Implement read support for CDN3

Browse source
This commit is contained in:
Jamie Kyle 2023-07-26 15:15:05 -07:00 committed by GitHub
parent 8aac997b4f
commit bbd43b6e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/main.ts
View file

@ -2276,6 +2276,7 @@ ipc.on('get-config', async event => {
artCreatorUrl: config.get<string>('artCreatorUrl'), artCreatorUrl: config.get<string>('artCreatorUrl'),
cdnUrl0: config.get<ConfigType>('cdn').get<string>('0'), cdnUrl0: config.get<ConfigType>('cdn').get<string>('0'),
cdnUrl2: config.get<ConfigType>('cdn').get<string>('2'), cdnUrl2: config.get<ConfigType>('cdn').get<string>('2'),
cdnUrl3: config.get<ConfigType>('cdn').get<string>('3'),
certificateAuthority: config.get<string>('certificateAuthority'), certificateAuthority: config.get<string>('certificateAuthority'),
environment: environment:
!isTestEnvironment(getEnvironment()) && ciMode !isTestEnvironment(getEnvironment()) && ciMode

3
config/default.json
View file

@ -5,7 +5,8 @@
"directoryMRENCLAVE": "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57", "directoryMRENCLAVE": "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57",
"cdn": { "cdn": {
"0": "https://cdn-staging.signal.org", "0": "https://cdn-staging.signal.org",
"2": "https://cdn2-staging.signal.org" "2": "https://cdn2-staging.signal.org",
"3": "https://cdn3-staging.signal.org"
}, },
"contentProxyUrl": "http://contentproxy.signal.org:443", "contentProxyUrl": "http://contentproxy.signal.org:443",
"updatesUrl": "https://updates2.signal.org/desktop", "updatesUrl": "https://updates2.signal.org/desktop",

3
config/production.json
View file

@ -5,7 +5,8 @@
"directoryMRENCLAVE": "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57", "directoryMRENCLAVE": "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57",
"cdn": { "cdn": {
"0": "https://cdn.signal.org", "0": "https://cdn.signal.org",
"2": "https://cdn2.signal.org" "2": "https://cdn2.signal.org",
"3": "https://cdn3.signal.org"
}, },
"artCreatorUrl": "https://create.signal.art", "artCreatorUrl": "https://create.signal.art",
"challengeUrl": "https://signalcaptchas.org/challenge/generate.html", "challengeUrl": "https://signalcaptchas.org/challenge/generate.html",

5
ts/textsecure/WebAPI.ts
View file

@ -1203,6 +1203,9 @@ export function initialize({
if (!isString(cdnUrlObject['2'])) { if (!isString(cdnUrlObject['2'])) {
throw new Error('WebAPI.initialize: Missing CDN 2 configuration'); throw new Error('WebAPI.initialize: Missing CDN 2 configuration');
} }
if (!isString(cdnUrlObject['3'])) {
throw new Error('WebAPI.initialize: Missing CDN 3 configuration');
}
if (!isString(certificateAuthority)) { if (!isString(certificateAuthority)) {
throw new Error('WebAPI.initialize: Invalid certificateAuthority'); throw new Error('WebAPI.initialize: Invalid certificateAuthority');
} }
@ -2655,7 +2658,7 @@ export function initialize({
const abortController = new AbortController(); const abortController = new AbortController();
const cdnUrl = isNumber(cdnNumber) const cdnUrl = isNumber(cdnNumber)
? cdnUrlObject[cdnNumber] || cdnUrlObject['0'] ? cdnUrlObject[cdnNumber] ?? cdnUrlObject['0']
: cdnUrlObject['0']; : cdnUrlObject['0'];
// This is going to the CDN, not the service, so we use _outerAjax // This is going to the CDN, not the service, so we use _outerAjax
const stream = await _outerAjax(`${cdnUrl}/attachments/${cdnKey}`, { const stream = await _outerAjax(`${cdnUrl}/attachments/${cdnKey}`, {

1
ts/types/RendererConfig.ts
View file

@ -33,6 +33,7 @@ export const rendererConfigSchema = z.object({
buildExpiration: z.number(), buildExpiration: z.number(),
cdnUrl0: configRequiredStringSchema, cdnUrl0: configRequiredStringSchema,
cdnUrl2: configRequiredStringSchema, cdnUrl2: configRequiredStringSchema,
cdnUrl3: configRequiredStringSchema,
challengeUrl: configRequiredStringSchema, challengeUrl: configRequiredStringSchema,
certificateAuthority: configRequiredStringSchema, certificateAuthority: configRequiredStringSchema,
contentProxyUrl: configRequiredStringSchema, contentProxyUrl: configRequiredStringSchema,

1
ts/windows/main/phase2-dependencies.ts
View file

@ -31,6 +31,7 @@ window.WebAPI = window.textsecure.WebAPI.initialize({
cdnUrlObject: { cdnUrlObject: {
0: config.cdnUrl0, 0: config.cdnUrl0,
2: config.cdnUrl2, 2: config.cdnUrl2,
3: config.cdnUrl3,
}, },
certificateAuthority: config.certificateAuthority, certificateAuthority: config.certificateAuthority,
contentProxyUrl: config.contentProxyUrl, contentProxyUrl: config.contentProxyUrl,