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.

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

Issue 497: Sanitize ID Field. #518

Merged
merged 1 commit into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/webapp/app/components/facetWidgetComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sage.component("facetWidget", {
$scope.addFacetFilter = function(facetName) {
if (!$scope.findFilterByFacet($scope.$ctrl.facet.label, facetName)) {
$scope.closeMoreFacets();
angular.element("#moreFacetsModal-" + $scope.$ctrl.facet.label.split(' ').join('-')).on('hidden.bs.modal', function (e) {
angular.element("#moreFacetsModal-" + $filter('simpleAscii')($scope.$ctrl.facet.label)).on('hidden.bs.modal', function (e) {
$scope.$ctrl.discoveryContext.addFilter($scope.$ctrl.facet.label, $scope.$ctrl.facet.key, facetName).then(function() {
$scope.$ctrl.resetSearch();
});
Expand Down Expand Up @@ -87,7 +87,7 @@ sage.component("facetWidget", {
$scope.moreFacets.push(...facets);
$scope.moreFacetsLabel = $scope.$ctrl.facet.label;

ModalService.openModal("#moreFacetsModal-" + $scope.$ctrl.facet.label.split(' ').join('-'));
ModalService.openModal("#moreFacetsModal-" + $filter('simpleAscii')($scope.$ctrl.facet.label));
};

$scope.closeMoreFacets = function() {
Expand Down
48 changes: 48 additions & 0 deletions src/main/webapp/app/filters/simpleAsciiFilter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
sage.filter('simpleAscii', function() {
return function(text, usedOps) {
var sanitized = "";
var digit = 0;

if (angular.isDefined(text) && angular.isString(text)) {
for (var i = 0; i < text.length; i++) {
digit = text.charCodeAt(i);

if (digit > 0x2F && digit < 0x3A) {
sanitized += text[i];
} else if (digit > 0x40 && digit < 0x5B) {
sanitized += text[i];
} else if (digit > 0x60 && digit < 0x7B) {
sanitized += text[i];
} else {
switch (digit) {
case 0x2B:
case 0x2D:
case 0x2E:
case 0x5F:
case 0x7E:
sanitized += text[i];
break;

default:
// Two-byte UTF-8.
if ((digit & 0xe0) == 0xc0) {
i++;
}
// Three-byte UTF-8.
else if ((digit & 0xf0) == 0xe0) {
i += 2;
}
// Four-byte UTF-8.
else if ((digit & 0xf8) == 0xf0) {
i += 3;
}

break;
}
}
}
}

return sanitized;
};
});
4 changes: 2 additions & 2 deletions src/main/webapp/app/views/components/facetWidget.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div>
<span ng-include="'views/components/facetTypes/'+$ctrl.facet.widget.toLowerCase()+'Facet.html'"></span>
<modal
modal-id="moreFacetsModal-{{$ctrl.facet.label.split(' ').join('-')}}"
modal-id="moreFacetsModal-{{$ctrl.facet.label | simpleAscii}}"
modal-view="views/modals/moreFacetsModal.html"
modal-header-class="modal-header-primary"
wvr-modal-backdrop="static">
</modal>
</div>
</div>
98 changes: 98 additions & 0 deletions src/main/webapp/tests/unit/filters/simpleAsciiFilterTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
describe("filter: simpleAscii", function () {
var $scope, MockedUser, filter;

var initializeVariables = function () {
inject(function (_$q_) {
$q = _$q_;

MockedUser = new mockUser($q);
});
};

var initializeFilter = function (settings) {
inject(function (_$filter_, _$rootScope_) {
$scope = _$rootScope_.$new();

filter = _$filter_("simpleAscii");
});
};

beforeEach(function () {
module("core");
module("sage");
module("templates");
module("mock.user", function ($provide) {
var User = function () {
return MockedUser;
};
$provide.value("User", User);
});
module("mock.userService");

installPromiseMatchers();
initializeVariables();
initializeFilter();
});

afterEach(function () {
$scope.$destroy();
});

describe("Is the filter", function () {
it("defined", function () {
expect(filter).toBeDefined();
});
});

describe("Does the filter", function () {
it("return nothing on empty input", function () {
var result;

result = filter("");

expect(result).toBe("");
});

it("all valid characters", function () {
var result;
var all = "abcdefghijklmnopqrstuvwxyz";
all += "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
all += "1234567890";
all += "+-._~";

result = filter(all);

expect(result).toBe(all);
});

it("without whitespace", function () {
var result;

// The character U+200A is between the 'h' and 'i' while U+200D is between the 'i' and 'j'.
// These may not normally display in a text editor.
var all = "a b c\fd e f g h i‍j";

result = filter(all);

expect(result).toBe("abcdefghij");
});

it("without most symbols", function () {
var result;
var all = "a`!@#$%^&*()=b{}[];:'\"\\|,<>/?";

result = filter(all);

expect(result).toBe("ab");
});

it("skips non-ascii unicode characters", function () {
var result;
var all = "a↡b𒆷c𔙃d𔑳↡𒆷𔙃e";

result = filter(all);

expect(result).toBe("abcde");
});
});
});