release v2.0.2

Fix argument double encoding for HttpHead

.travis.yml

@@ -2,11 +2,11 @@ sudo: false
 
 language: objective-c
 os: osx
-osx_image: xcode9.1
+osx_image: xcode9.3
 
 env:
-  - TARGET_PLATFORM=android
   - TARGET_PLATFORM=ios
+  - TARGET_PLATFORM=android ANDROID_API_LEVEL=27 ANDROID_BUILD_TOOLS_VERSION=28.0.3
 
 cache:
   directories:
@@ -23,9 +23,9 @@ install:
 - if [ $TARGET_PLATFORM = "android" ]; then
     brew update &&
     brew install gradle &&
-    scripts/setup-android-sdk.sh &&
+    scripts/setup-android-sdk.sh -a $ANDROID_API_LEVEL -b $ANDROID_BUILD_TOOLS_VERSION &&
     export ANDROID_HOME=$(pwd)/android-sdk-macosx &&
-    export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/23.0.2;
+    export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION;
   fi
 
 script:

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.2
+
+- Fixed #142: Plugin affected by REDoS Issue of tough-cookie
+- Fixed #157: Arguments are double URL-encoded on "downloadFile" (thanks TheZopo)
+- Fixed #164: Arguments are double URL-encoded on "head" (thanks ath0mas)
+
 ## 2.0.1
 
 - Fixed #136: Content-Type header non-overwritable on browser platform

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-advanced-http",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
   "scripts": {
     "updatecert": "node ./scripts/update-test-cert.js",
@@ -63,7 +63,7 @@
     "mocha": "4.0.0",
     "mock-require": "2.0.2",
     "mz": "2.7.0",
-    "umd-tough-cookie": "2.3.2",
+    "umd-tough-cookie": "2.4.3",
     "wd": "1.4.1",
     "xml2js": "0.4.19"
   }

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="2.0.1">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="2.0.2">
   <name>Advanced HTTP plugin</name>
   <description>
         Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning

scripts/build-test-app.sh

@@ -2,6 +2,7 @@
 set -e
 
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+WORKINGCOPY=$ROOT/temp/workingcopy
 CDV=$ROOT/node_modules/.bin/cordova
 
 PLATFORM=ios
@@ -38,7 +39,8 @@ rm -rf $ROOT/temp
 mkdir $ROOT/temp
 cp -r $ROOT/test/app-template/ $ROOT/temp/
 cp $ROOT/test/app-test-definitions.js $ROOT/temp/www/
+rsync -ax --exclude node_modules --exclude scripts --exclude temp --exclude test $ROOT $WORKINGCOPY
 cd $ROOT/temp
 $CDV prepare
-$CDV plugins add $ROOT
-$CDV build $PLATFORM --$TARGET
+$CDV plugins add $WORKINGCOPY
+$CDV build $PLATFORM --$TARGET --buildConfig build.json

scripts/setup-android-sdk.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 set -e
 
+while getopts a:b: option; do
+  case "${option}" in
+    a) API_LEVEL=${OPTARG};;
+    b) BUILD_TOOLS_VERSION=${OPTARG};;
+  esac
+done
+
 curl http://dl.google.com/android/android-sdk_r24.4-macosx.zip -o android-sdk-macosx.zip
 tar -xvf android-sdk-macosx.zip
 
 echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter platform-tools
-echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-25.0.0
-echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-25
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-${BUILD_TOOLS_VERSION}
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-${API_LEVEL}
 echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-support
 echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-m2repository
 echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-google-m2repository

scripts/upload-artifact.sh

@@ -15,7 +15,7 @@ if [ $PLATFORM = "android" ]; then
       -X POST \
       -H "Content-Type: application/octet-stream" \
       https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.apk?overwrite=true \
-      --data-binary @$TEMP/platforms/android/build/outputs/apk/android-debug.apk
+      --data-binary @$TEMP/platforms/android/app/build/outputs/apk/debug/app-debug.apk
 else
   rm -rf $TEMP/HttpDemo.app.zip
   pushd $TEMP/platforms/ios/build/emulator

src/android/com/synconset/cordovahttp/CordovaHttpDownload.java

@@ -31,7 +31,7 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
     @Override
     public void run() {
         try {
-            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), true);
+            HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), false);
 
             this.prepareRequest(request);
 

src/android/com/synconset/cordovahttp/CordovaHttpHead.java

@@ -23,7 +23,7 @@ class CordovaHttpHead extends CordovaHttp implements Runnable {
     @Override
     public void run() {
         try {
-            HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParamsMap(), true);
+            HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParamsMap(), false);
 
             this.prepareRequest(request);
             this.returnResponseObject(request);

test/app-mocha-specs/helpers/apps.js

@@ -6,5 +6,5 @@ if (process.env.SAUCE_USERNAME) {
 } else {
   // these paths are relative to working directory
   exports.iosTestApp = path.resolve('temp/platforms/ios/build/emulator/HttpDemo.app');
-  exports.androidTestApp = path.resolve('temp/platforms/android/build/outputs/apk/android-debug.apk');
+  exports.androidTestApp = path.resolve('temp/platforms/android/app/build/outputs/apk/debug/app-debug.apk');
 }

test/app-mocha-specs/helpers/caps.js

@@ -1,7 +1,5 @@
 const local = {
   iosDevice: {
-    browserName: '',
-    'appium-version': '1.7.1',
     platformName: 'iOS',
     platformVersion: '10.3',
     deviceName: 'iPhone 6',
@@ -9,8 +7,6 @@ const local = {
     app: undefined // will be set later
   },
   iosEmulator: {
-    browserName: '',
-    'appium-version': '1.7.1',
     platformName: 'iOS',
     platformVersion: '11.0',
     deviceName: 'iPhone Simulator',
@@ -18,8 +14,6 @@ const local = {
     app: undefined // will be set later
   },
   androidEmulator: {
-    browserName: '',
-    'appium-version': '1.7.1',
     platformName: 'Android',
     platformVersion: '5.1',
     deviceName: 'Android Emulator',

test/app-template/build.json

@@ -0,0 +1,14 @@
+{
+  "ios": {
+    "debug": {
+      "buildFlag": [
+        "-UseModernBuildSystem=0"
+      ]
+    },
+    "release": {
+      "buildFlag": [
+        "-UseModernBuildSystem=0"
+      ]
+    }
+  }
+}

test/app-template/config.xml

@@ -22,8 +22,9 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-    <engine name="android" spec="6.2.3" />
+    <engine name="android" spec="7.1.0" />
     <engine name="browser" spec="5.0.0" />
     <engine name="ios" spec="4.4.0" />
-    <plugin name="cordova-plugin-file" spec="4.3.3" />
+    <plugin name="cordova-plugin-file" spec="6.0.1" />
+    <preference name="AndroidPersistentFileLocation" value="Internal" />
 </widget>

test/app-template/package.json

@@ -12,7 +12,8 @@
     "license": "Apache-2.0",
     "dependencies": {
         "cordova": "7.0.1",
-        "cordova-android": "6.2.3",
+        "cordova-android": "7.1.0",
+        "cordova-browser": "5.0.0",
         "cordova-ios": "4.4.0"
     },
     "cordova": {