@forge/csp 5.2.0-next.1 → 5.2.0-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csp-injection-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-injection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AAEvD,aAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,aAAK,oBAAoB,GAAG;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,MAAM,CAAC;CAC3B,CAAC;AAEF,aAAK,SAAS,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"csp-injection-service.d.ts","sourceRoot":"","sources":["../../src/csp/csp-injection-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAmB,MAAM,UAAU,CAAC;AAEvD,aAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,aAAK,oBAAoB,GAAG;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,MAAM,CAAC;CAC3B,CAAC;AAEF,aAAK,SAAS,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAsI1D,eAAO,MAAM,qBAAqB,cAAe,iBAAiB,cAAc,SAAS,KAAG,MAAM,EAUjG,CAAC;AAMF,eAAO,MAAM,kCAAkC,UAAiE,CAAC;AAEjH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,iBAAiB;IAiDlB,gBAAgB;4BAQD,UAAU;mBACnB,iBAAiB;;;;;UAK1B,MAAM,EAAE,CAoEV;CACH"}
|
|
@@ -93,6 +93,17 @@ const getAtlassianHost = (hostType, microsEnv, icOptions) => {
|
|
|
93
93
|
}
|
|
94
94
|
return hostMap[microsEnv];
|
|
95
95
|
};
|
|
96
|
+
const getFOSHost = (microsEnv, icOptions) => {
|
|
97
|
+
const fosHost = getAtlassianHost('ATLASSIAN_FOS_HOST', microsEnv, icOptions);
|
|
98
|
+
return [
|
|
99
|
+
`${fosHost}/fos-eap/upload/*/`,
|
|
100
|
+
`${fosHost}/fos-eap/download/*/`,
|
|
101
|
+
`${fosHost}/fop/app/upload/*/`,
|
|
102
|
+
`${fosHost}/fop/app/download/*/`,
|
|
103
|
+
`${fosHost}/fop/cdn/upload/*/`,
|
|
104
|
+
`${fosHost}/fop/cdn/download/*/`
|
|
105
|
+
];
|
|
106
|
+
};
|
|
96
107
|
const getAtlassianImageHost = (microsEnv, icOptions) => {
|
|
97
108
|
return [
|
|
98
109
|
`https://${getAtlassianHost('ATLASSIAN_AVATAR_HOST', microsEnv, icOptions)}`,
|
|
@@ -123,6 +134,7 @@ class CSPInjectionService {
|
|
|
123
134
|
hostname,
|
|
124
135
|
...exports.EXTERNAL_ALLOW_LISTED_IMAGES_HOSTS,
|
|
125
136
|
...(0, exports.getAtlassianImageHost)(microsEnv, icOptions),
|
|
137
|
+
...getFOSHost(microsEnv, icOptions),
|
|
126
138
|
...this.getExistingCSPDetails(types_1.ExternalCspType.IMG_SRC, existingCSPDetails)
|
|
127
139
|
]
|
|
128
140
|
.filter((a) => a)
|
|
@@ -145,6 +157,7 @@ class CSPInjectionService {
|
|
|
145
157
|
const scriptSrc = [
|
|
146
158
|
"'self'",
|
|
147
159
|
this.getForgeGlobalCSP(microsEnv, isFedRAMP, icOptions),
|
|
160
|
+
...getFOSHost(microsEnv, icOptions),
|
|
148
161
|
...this.getExistingCSPDetails(types_1.ExternalCspType.SCRIPT_SRC, existingCSPDetails)
|
|
149
162
|
].join(' ');
|
|
150
163
|
const styleSrc = [
|
|
@@ -208,15 +221,7 @@ class CSPInjectionService {
|
|
|
208
221
|
if (fopGeHost) {
|
|
209
222
|
allowed.push(fopGeHost);
|
|
210
223
|
}
|
|
211
|
-
|
|
212
|
-
if (fosHost) {
|
|
213
|
-
allowed.push(`${fosHost}/fos-eap/upload/*/`);
|
|
214
|
-
allowed.push(`${fosHost}/fos-eap/download/*/`);
|
|
215
|
-
allowed.push(`${fosHost}/fop/app/upload/*/`);
|
|
216
|
-
allowed.push(`${fosHost}/fop/app/download/*/`);
|
|
217
|
-
allowed.push(`${fosHost}/fop/cdn/upload/*/`);
|
|
218
|
-
allowed.push(`${fosHost}/fop/cdn/download/*/`);
|
|
219
|
-
}
|
|
224
|
+
allowed.push(...getFOSHost(microsEnv, icOptions));
|
|
220
225
|
return allowed;
|
|
221
226
|
}
|
|
222
227
|
getFrameAncestors(microsEnv, hostname, icOptions) {
|