Dpatrick has uploaded a new change for review. https://gerrit.wikimedia.org/r/238350
Change subject: Support scanning beta mobile ...................................................................... Support scanning beta mobile Change-Id: I6aa09e9e56d9a66395e0b1565f61b335015549c8 --- M README.md C ZAP/contexts/MW-automated-beta-en-mobile.context R ZAP/contexts/MW-automated-beta-en.context M bin/run_scan.pl 4 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/security/automated-scanning refs/changes/50/238350/1 diff --git a/README.md b/README.md index 4dafd8e..73580bd 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ 1. Install local::lib, using the boostrapping technique (https://metacpan.org/pod/local::lib#The-bootstrapping-technique). 2. Install cpanminus locally (https://metacpan.org/pod/App::cpanminus#Installing-to-local-perl-perlbrew-plenv-etc). 3. In your working copy, run: - $ cpanm --installdeps . +``` +automated-scanning$ cpanm --installdeps . +``` 4. That's it. Now you can run scripts in bin/. No need to install the module. diff --git a/ZAP/contexts/MW-automated-beta.context b/ZAP/contexts/MW-automated-beta-en-mobile.context similarity index 92% copy from ZAP/contexts/MW-automated-beta.context copy to ZAP/contexts/MW-automated-beta-en-mobile.context index 3ffac15..701396d 100644 --- a/ZAP/contexts/MW-automated-beta.context +++ b/ZAP/contexts/MW-automated-beta-en-mobile.context @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <configuration> <context> -<name>MW-automated-beta</name> +<name>MW-automated-beta-en-mobile</name> <desc>context.desc</desc> <inscope>true</inscope> -<incregexes>\Qhttp://en.wikipedia.beta.wmflabs.org\E.*</incregexes> +<incregexes>\Qhttp://en.m.wikipedia.beta.wmflabs.org\E.*</incregexes> <tech> <include>Db.MySQL</include> <include>Language.PHP</include> diff --git a/ZAP/contexts/MW-automated-beta.context b/ZAP/contexts/MW-automated-beta-en.context similarity index 97% rename from ZAP/contexts/MW-automated-beta.context rename to ZAP/contexts/MW-automated-beta-en.context index 3ffac15..68a810d 100644 --- a/ZAP/contexts/MW-automated-beta.context +++ b/ZAP/contexts/MW-automated-beta-en.context @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <configuration> <context> -<name>MW-automated-beta</name> +<name>MW-automated-beta-en</name> <desc>context.desc</desc> <inscope>true</inscope> <incregexes>\Qhttp://en.wikipedia.beta.wmflabs.org\E.*</incregexes> diff --git a/bin/run_scan.pl b/bin/run_scan.pl index d8d9579..bf75f16 100755 --- a/bin/run_scan.pl +++ b/bin/run_scan.pl @@ -212,10 +212,18 @@ $context = 'MW-automated-vagrant.context'; $ENV{'MEDIAWIKI_ENVIRONMENT'} = 'mw-vagrant-host'; } - when (/^beta/) { + when (/^beta_en$/) { $environment = $env; $target = 'http://en.wikipedia.beta.wmflabs.org/'; - $context = 'MW-automated-beta.context'; + $context = 'MW-automated-beta-en.context'; + $ENV{'MEDIAWIKI_ENVIRONMENT'} = 'beta'; + $ENV{'MEDIAWIKI_USER'} = 'Scanner_user_0'; + $ENV{'MEDIAWIKI_PASSWORD'} = 'default'; + } + when (/^beta_en_mobile$/) { + $environment = $env; + $target = 'http://en.m.wikipedia.beta.wmflabs.org/'; + $context = 'MW-automated-beta-en-mobile.context'; $ENV{'MEDIAWIKI_ENVIRONMENT'} = 'beta'; $ENV{'MEDIAWIKI_USER'} = 'Scanner_user_0'; $ENV{'MEDIAWIKI_PASSWORD'} = 'default'; @@ -243,7 +251,7 @@ when (/^vagrant$/) { ask('Now run browsertests; hit Enter when complete.', "", undef); } - when (/^(?:vagrant_auto|beta)$/) { + when (/(?:^vagrant_auto$|^beta)/) { run_browser_tests($opt->get_browser_test_path); } } -- To view, visit https://gerrit.wikimedia.org/r/238350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6aa09e9e56d9a66395e0b1565f61b335015549c8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/security/automated-scanning Gerrit-Branch: master Gerrit-Owner: Dpatrick <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
