Skip to content

Commit 5064346

Browse files
authored
March 25 QA (#2504)
* Dependency bump * Strict firebaseio domain check * Fix frida server download proxy SSL verify config * Fix CI build on mac
1 parent ae34f7c commit 5064346

File tree

5 files changed

+316
-319
lines changed

5 files changed

+316
-319
lines changed

.github/workflows/mobsf-test.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
- name: Install macOS Dependencies
4848
if: startsWith(matrix.os, 'macOS')
4949
run: |
50-
brew install --cask wkhtmltopdf
50+
export WKHTML_URL=https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-2/
51+
export WKHTML_PKG=wkhtmltox-0.12.6-2.macos-cocoa.pkg
52+
curl -L ${WKHTML_URL}${WKHTML_PKG} -O && sudo installer -pkg ${WKHTML_PKG} -target ~ && rm -rf ${WKHTML_PKG}
5153
5254
- name: Install Windows Dependencies
5355
if: startsWith(matrix.os, 'windows')

mobsf/DynamicAnalyzer/views/android/frida_server_download.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def clean_up_old_binaries(dirc, version):
3030
pass
3131

3232

33-
def download_frida_server(url, version, fname, proxies):
33+
def download_frida_server(url, version, fname, proxies, verify):
3434
"""Download frida-server-binary."""
3535
try:
3636
download_dir = Path(settings.DWD_DIR)
@@ -40,6 +40,7 @@ def download_frida_server(url, version, fname, proxies):
4040
url,
4141
timeout=5,
4242
proxies=proxies,
43+
verify=verify,
4344
stream=True) as r:
4445
with LZMAFile(r.raw) as f:
4546
with open(dwd_loc, 'wb') as flip:
@@ -72,7 +73,7 @@ def update_frida_server(arch, version):
7273
for item in response.json()['assets']:
7374
if item['name'] == f'{fserver}.xz':
7475
url = item['browser_download_url']
75-
return download_frida_server(url, version, fserver, proxies)
76+
return download_frida_server(url, version, fserver, proxies, verify)
7677
return False
7778
except Exception:
7879
logger.exception('[ERROR] Fetching Frida Server Release')

mobsf/StaticAnalyzer/views/common/firebase.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def open_firebase(checksum, url):
8585
logger.warning(invalid)
8686
return url, False
8787
purl = urlparse(url)
88-
if not purl.netloc.endswith('firebaseio.com'):
88+
if not purl.netloc.endswith('.firebaseio.com'):
8989
logger.warning(invalid)
9090
return url, False
9191
base_url = f'{purl.scheme}://{purl.netloc}/.json'
@@ -116,7 +116,7 @@ def firebase_db_check(checksum, code_an_dic):
116116
try:
117117
urls = list(set(code_an_dic['urls_list']))
118118
for url in urls:
119-
if 'firebaseio.com' not in url:
119+
if '.firebaseio.com' not in url:
120120
continue
121121
returl, is_open = open_firebase(checksum, url)
122122
if is_open:

0 commit comments

Comments
 (0)