Merge branch 'develop'

wultra · Feb 19, 2024 · de8a30a · de8a30a
2 parents 41cab64 + e512ac8
commit de8a30a
Show file tree

Hide file tree

Showing 36 changed files with 1,547 additions and 523 deletions.
diff --git a/.deploy/docs/Release-Notes.md b/.deploy/docs/Release-Notes.md
@@ -4,12 +4,15 @@
 
 ### Release %DEPLOY_VERSION%
 
-- Add xml2js devDependency
-- Update Cordova Android to 12.0.1
-- Update Cordova iOS to 7.0.1
 
 ## Previous Releases
 
+### Release 5.0.1
+
+- Add xml2js devDependency (#72)
+- Update Cordova Android to 12.0.1
+- Update Cordova iOS to 7.0.1
+
 ### Release 5.0.0
 
 - Update Malwarelytics for Android to 0.24.0 (#60)

diff --git a/.deploy/package.json b/.deploy/package.json
@@ -42,6 +42,7 @@
   ],
   "dependencies": {},
   "devDependencies": {
+    "@types/node": "^20.6.0",
     "@types/cordova": "11.0.3",
     "compare-func": "^2.0.0",
     "shelljs": "^0.8.5",

diff --git a/.deploy/plugin.xml b/.deploy/plugin.xml
@@ -19,6 +19,7 @@
 <plugin id="cordova-plugin-malwarelytics" version="%DEPLOY_VERSION%" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>MalwarelyticsPlugin</name>
     <description>Cordova plugin for Malwarelytics</description>
+    <author>Wultra</author>
     <license>Apache 2.0</license>
     <keywords>cordova,android,malwarelytics</keywords>
     <js-module name="MalwarelyticsPlugin" src="www/MalwarelyticsPlugin.js">
@@ -84,7 +85,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="AppProtection" options=":git => 'https://github.com/wultra/malwarelytics-apple-release.git', :tag => '2.0.0'" />
+                <pod name="AppProtection" options=":git => 'https://github.com/wultra/malwarelytics-apple-release.git', :tag => '2.1.1'" />
             </pods>
             </podspec>
     </platform>

diff --git a/demoapp/config.xml b/demoapp/config.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.wultra.android.cordova.malwarelytics.demo" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.wultra.android.cordova.malwarelytics.demo" version="5.0.2-dev" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>MalwarelyticsPluginTest</name>
     <description>
-        A sample Apache Cordova application that responds to the deviceready event.
+        A sample Apache Cordova application integrating Malwarelytics for Cordova.
     </description>
-    <author email="dev@cordova.apache.org" href="http://cordova.io">
-        Apache Cordova Team
+    <author email="hello@wultra.com" href="https://www.wultra.com/">
+        Wultra
     </author>
     <content src="index.html" />
     <access origin="*" />

diff --git a/demoapp/malwarelytics.xml b/demoapp/malwarelytics.xml
@@ -63,13 +63,14 @@
             username="SERVICE_USERNAME_APPLE"
             password="SERVICE_PASSWORD_APPLE"
             publicKey="SERVICE_PUB_KEY_APPLE"
-        />
+        /> 
+
 
          <!-- 
             netrc file configuration (for private CocoaPods access)
             
             Note that artifactory credentials will be added (if not present) to the
-            .netrc/_netrc file in your home folder.
+            '.netrc' file in your home folder.
 
                login : Login for the repo
             password : Password for the repo
@@ -80,6 +81,25 @@
             password="ARTIFACTORY_PASSWORD"
             url="ARTIFACTORY_URL"
         />
+
+        <!-- 
+            RASP configuration for Apple.
+
+            appPresenceQueries : Query URL schemes for Info.plist. Each should be added as <string>SCHEME</string> subtag.
+        -->
+        <rasp>
+            <appPresenceQueries>
+                <string>cydia</string>
+                <string>anydesk</string>
+                <string>tvsqcustomer1</string>
+                <string>logmein</string>
+                <string>rdp</string>
+                <string>jump</string>
+                <string>prlclient</string>
+                <string>tuxclient</string>
+                <string>crd</string>
+            </appPresenceQueries>
+        </rasp>
     </apple>
 
 </malwarelytics>
diff --git a/demoapp/package-lock.json b/demoapp/package-lock.json
diff --git a/demoapp/package.json b/demoapp/package.json
@@ -1,14 +1,14 @@
 {
   "name": "com.wultra.android.cordova.malwarelytics.demo",
   "displayName": "Malwarelytics Cordova Demo",
-  "version": "5.0.1-dev",
+  "version": "5.0.2-dev",
   "description": "Example Wultra Malwarelytics integration into Cordova app",
   "main": "index.js",
   "scripts": {
     "preparePlugin": "pushd .. && tsc && popd",
     "installPlugin": "pushd .. && rm -rf package && npm pack | xargs tar zxvf && popd && cordova plugin add ../package",
     "installPluginNpm": "cordova plugin add cordova-plugin-malwarelytics",
-    "uninstallPlugin": "cordova plugin rm cordova-plugin-malwarelytics",
+    "uninstallPlugin": "cordova plugin rm cordova-plugin-malwarelytics || true",
     "reinstallAndPreparePlugin": "( npm run uninstallPlugin || true ) && npm run preparePlugin && npm run installPlugin",
     "reinstallPlugin": "( npm run uninstallPlugin || true ) && npm run installPlugin",
     "prepareConfig": "node ./malwarelytics.xml.patch.js",
@@ -31,9 +31,13 @@
     "startEmulatorIos": "cordova run ios",
     "buildIos": "tsc && cordova build ios",
     "cleanIos": "cordova clean ios",
+    "forceCleanIos": "xattr -w com.apple.xcode.CreatedByBuildSystem true ./platforms/ios/build && npm run cleanIos",
     "rebuildIos": "npm run cleanIos && npm run buildIos",
+    "rebuildPluginAndIos": "npm run reinstallAndPreparePlugin && npm run fixXcodeProjIos12 && npm run buildIos",
     "prepareAndRunOnIos": "npm i && npm run prepareIos && npm run installPlugin && npm run rebuildIos && cordova run ios",
-    "prepareAndRunOnIosEmulator": "npm i && npm run prepareIos && npm run installPlugin && npm run startEmulatorIos"
+    "prepareAndRunOnIosEmulator": "npm i && npm run prepareIos && npm run installPlugin && npm run startEmulatorIos",
+    "resetDemoApp": "npm run removeAndroid && npm run removeIos && npm run uninstallPlugin",
+    "warmupDemoApp": "npm run addAndroid && npm run addIos && npm run reinstallAndPreparePlugin"
   },
   "keywords": [
     "ecosystem:cordova"
@@ -46,7 +50,7 @@
   },
   "devDependencies": {
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "typescript": "^5.1.6",
+    "typescript": "^5.3.3",
     "xml2js": "^0.6.2"
   },
   "cordova": {
@@ -56,4 +60,4 @@
     },
     "platforms": []
   }
-}
+}
diff --git a/demoapp/tsconfig.json b/demoapp/tsconfig.json
@@ -2,10 +2,12 @@
   "compilerOptions": {
     "lib": [ "dom", "ES6" ],
     "module": "None",
+    "moduleResolution": "Node",
     "noImplicitAny": false,
     "removeComments": true,
-    "strict": false
+    "strict": false,
+    "noEmitOnError": true
   },
   "exclude": [ "plugins", "node_modules" ],
   "include": [ "./www/js/*.ts" ]
-}
+}
diff --git a/demoapp/www/index.html b/demoapp/www/index.html
@@ -37,22 +37,33 @@ <h3>Language</h3>
                 </select>
                 <div>
                     <h3>Rasp Features</h3>
+                    <!-- observable features -->
                     <button class="rasp-button" id="is-rooted-button">Is Rooted</button>
                     <button class="rasp-button" id="root-info-button">Root Info</button>
                     <button class="rasp-button" id="is-emulator-button">Is Emulator</button>
                     <button class="rasp-button" id="emulator-info-button">Emulator Info</button>
                     <button class="rasp-button" id="is-debugger-button">Is Debugger</button>
                     <button class="rasp-button" id="debugger-info-button">Debugger Info</button>
-                    <button class="rasp-button" id="http-proxy-info-button">Http Proxy</button>
-                    <button class="rasp-button" id="is-http-proxy-button">Is Http Proxy</button>
                     <button class="rasp-button" id="repackage-info-button">Repackage Info</button>
-                    <button class="rasp-button" id="is-screenshared-button">Is Screen Shared</button>
-                    <button class="rasp-button" id="screenshared-info-button">Screen Sharing Info</button>
-                    <button class="rasp-button" id="is-screenlock-button">Is Screen Lock Enabled</button>
-                    <button class="rasp-button" id="is-playprotect-button">Is Play Protect Enabled</button>
+                    <button class="rasp-button" id="is-screen-shared-button">Is Screen Shared</button>
+                    <button class="rasp-button" id="screen-shared-info-button">Screen Sharing Info</button>
+                    <button class="rasp-button" id="is-bad-tapjacking-capable-app-button">Is Bad Tapjacking-Capable App Present</button>
+                    <button class="rasp-button" id="tapjacking-info-button">Tapjacking Info</button>
+                    <button class="rasp-button" id="is-http-proxy-button">Is Http Proxy</button>
+                    <button class="rasp-button" id="http-proxy-info-button">Http Proxy</button>
+                    <button class="rasp-button" id="is-vpn-button">Is VPN Enabled</button>
+                    <button class="rasp-button" id="is-adb-button">Is ADB Enabled</button>
+                    <button class="rasp-button" id="is-active-call-button">Is Active Call</button>
+                    <button class="rasp-button" id="active-call-info-button">Active Call Info</button>
+                    <button class="rasp-button" id="app-presence-info-button">App Presence Info</button>
+                    <!-- passive features -->
                     <button class="rasp-button" id="is-screen-reader-button">Is Screen Reader Enabled</button>
+                    <button class="rasp-button" id="screen-reader-info-button">Screen Reader Info</button>
+                    <!-- info features -->
+                    <button class="rasp-button" id="is-screen-lock-button">Is Screen Lock Enabled</button>
+                    <button class="rasp-button" id="biometry-info-button">Biometry Info</button>
+                    <button class="rasp-button" id="is-play-protect-button">Is Play Protect Enabled</button>
                     <button class="rasp-button" id="is-developer-options-button">Is Developer Options Enabled</button>
-                    <button class="rasp-button" id="is-adb-button">Is ADB Enabled</button>
                 </div>
                 <h2>Malware and dangerous apps</h2>
                 <div id="installed-apps">
@@ -76,6 +87,7 @@ <h3>Rasp Features</h3>
                 <button class="rasp-button" id="biometry-button">Is Biometry Enabled</button>
                 <button class="rasp-button" id="vpn-active">Is VPN Active</button>
                 <button class="rasp-button" id="on-call">Is On Call</button>
+                <button class="rasp-button" id="apps-presence">Installed Apps</button>
             </div>
         </div>
         <script type="text/javascript" src="cordova.js"></script>