Mixed

galeksandrp · galeksandrp · commit 0d661b358881 · 2017-03-07T01:20:20.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,4 @@ services:
 script:
   - test/travis.sh
 env:
-  - TEST=firefox FIREFOX=firefox-dev
-  - TEST=firefox FIREFOX=firefox-latest
-  - TEST=firefox FIREFOX=firefox-esr-latest
-  - TEST=chromium
-  - TEST=rules
-  - TEST=fetch
-  - TEST=preloaded
+  - TEST=mixed
diff --git a/src/chrome/content/rules/freerunet.ru.xml b/src/chrome/content/rules/freerunet.ru.xml
@@ -1,7 +1,7 @@
 <!--
 www.freerunet.ru self signed
 -->
-<ruleset name="freerunet.ru" platform="mixedcontent">
+<ruleset name="freerunet.ru">
 	<target host="freerunet.ru" />
 	<target host="www.freerunet.ru" />
 	
diff --git a/test/travis.sh b/test/travis.sh
@@ -26,7 +26,7 @@ trap 'git remote remove upstream-for-travis' EXIT
 
 # Only do a shallow fetch if we're in Travis.  No need otherwise.
 if [ $TRAVIS ]; then
-  git fetch --depth=1 upstream-for-travis master
+  git fetch --depth=50 upstream-for-travis master
 else
   git fetch upstream-for-travis master
 fi
@@ -79,6 +79,11 @@ if [ "$RULESETS_CHANGED" ]; then
     docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "cd /opt/utils/hsts-prune && npm install && node index.js"
     [ `git diff --name-only | wc -l` -eq 0 ]
   fi
+  
+  if [ "$TEST" == "mixed" ]; then
+    echo >&2 "Ensuring rulesets do not introduce targets containing active mixed content."
+    docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "apt-get update && apt-get install libxml2-utils && npm install galeksandrp/check-mixed-content#245e56ad5fd5412bdad986276911e5460d9e48c6 && xmllint --xpath '//target' $(echo $RULESETS_CHANGED) | sed 's/<target host=\"//g' | sed 's&\"/>&\n&g' | grep -v '*' | xargs -n1 -i bash -c 'check-mixed-content --depth=1 {} || echo {} && exit 255'"
+  fi
 fi
 
 exit 0
