WEBDIENSTE/YellowLabTools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename blacklist and whitelist into block list and allowlist

Browse Source
This commit is contained in:
Gaël Métais
2020-08-11 01:37:32 +02:00
parent 6e6285c5ae
commit 1bdfc8a5d2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/cli.js
+2 -2
View File
@@ -20,8 +20,8 @@ var cli = meow({
' --cookie Adds a cookie on the main domain.',
' --auth-user Basic HTTP authentication username.',
' --auth-pass Basic HTTP authentication password.',
' --block-domain Disallow requests to given (comma-separated) domains - aka blacklist.',
' --allow-domain Only allow requests to given (comma-separated) domains - aka whitelist.',
' --block-domain Disallow requests to given (comma-separated) domains.',
' --allow-domain Only allow requests to given (comma-separated) domains.',
' --no-externals Block all domains except the main one.',
' --reporter The output format: "json" or "xml". Default is "json".',
''
front/src/js/services/apiService.js
+2 -2
View File
@@ -21,9 +21,9 @@ apiService.factory('API', ['$location', 'Runs', 'Results', function($location, R
};
if (settings.domainsBlackOrWhite === 'black') {
if (settings.domainsBlockOrAllow === 'block') {
runObject.blockDomain = this.parseDomains(settings.domains);
} else if (settings.domainsBlackOrWhite === 'white') {
} else if (settings.domainsBlockOrAllow === 'allow') {
var allowedDomains = this.parseDomains(settings.domains);
if (allowedDomains.length > 0) {
runObject.allowDomain = allowedDomains;
front/src/views/index.html
+2 -2
View File
@@ -83,8 +83,8 @@
</div>
<div>
<div>
<input type="radio" name="blackOrWhite" ng-model="settings.domainsBlackOrWhite" value="black" />blacklist
<input type="radio" name="blackOrWhite" ng-model="settings.domainsBlackOrWhite" value="white" />whitelist
<input type="radio" name="blockOrAllow" ng-model="settings.domainsBlockOrAllow" value="block" />block list
<input type="radio" name="blockOrAllow" ng-model="settings.domainsBlockOrAllow" value="allow" />allow list
</div>
<textarea name="domains" ng-model="settings.domains" rows="5"></textarea>
</div>