github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12263 from harryadel/underscore/browser-policy

Browse Source 
[browser-policy] Remove underscore
This commit is contained in:
Gabriel Grubba
2022-10-24 11:59:22 -03:00
committed by GitHub
parent 8807aa0070 236ffc2a5a
commit 16859c7b85
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/browser-policy/browser-policy-test.js
View File

@@ -1,17 +1,34 @@
BrowserPolicy._setRunningTest();
var toObject = function(list, values) {
if (list == null) return {};
var result = {};
for (var i = 0, length = list.length; i < length; i++) {
if (values) {
result[list[i]] = values[i];
} else {
result[list[i][0]] = list[i][1];
}
}
return result;
};
var cspsEqual = function (csp1, csp2) {
var cspToObj = function (csp) {
csp = csp.substring(0, csp.length - 1);
var parts = _.map(csp.split("; "), function (part) {
var parts = csp.split("; ").map(function (part) {
return part.split(" ");
});
var keys = _.map(parts, _.first);
var values = _.map(parts, _.rest);
_.each(values, function (value) {
var keys = parts.map(part => part[0]);
var values = parts.map((part) => {
const [head, ...tail] = part;
return tail;
});
values.forEach(function (value) {
value.sort();
});
return _.object(keys, values);
return toObject(keys, values);
};
return EJSON.equals(cspToObj(csp1), cspToObj(csp2));
@@ -137,11 +154,11 @@ Tinytest.add("browser-policy - csp", function (test) {
"default-src 'none'; frame-src https://foo.com; " +
"object-src http://foo.com https://foo.com;"));
// Check that frame-ancestors property is set correctly.

BrowserPolicy.content.allowFrameAncestorsOrigin("https://foo.com/");

test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),

"default-src 'none'; frame-src https://foo.com; " +

"object-src http://foo.com https://foo.com; " +

// Check that frame-ancestors property is set correctly.
BrowserPolicy.content.allowFrameAncestorsOrigin("https://foo.com/");
test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
"default-src 'none'; frame-src https://foo.com; " +
"object-src http://foo.com https://foo.com; " +
"frame-ancestors https://foo.com;"));
// CSP2 options: nonce
@@ -188,4 +205,4 @@ Tinytest.add("browser-policy - X-Content-Type-Options", function (test) {
test.equal(BrowserPolicy.content._xContentTypeOptions(), "nosniff");
BrowserPolicy.content.allowContentTypeSniffing();
test.equal(BrowserPolicy.content._xContentTypeOptions(), undefined);
});
});

2
packages/browser-policy/package.js
View File

@@ -11,6 +11,6 @@ Package.onUse(function (api) {
});
Package.onTest(function (api) {
api.use(["tinytest", "browser-policy", "ejson", "underscore"], "server");
api.use(["tinytest", "browser-policy", "ejson"], "server");
api.addFiles("browser-policy-test.js", "server");
});