Bug fixes from upstream merge

mobsf/StaticAnalyzer/views/common/appsec.py

@@ -161,8 +161,10 @@ def common_fields(findings, data):
     warn = len(findings.get('warning'))
     sec = len(findings.get('secure'))
     total = high + warn + sec
-    score = int(100 - (
-        ((high * 1) + (warn * .5) - (sec * .2)) / total) * 100)
+    score = 100
+    if total > 0:
+        score = int(100 - (
+            ((high * 1) + (warn * .5) - (sec * .2)) / total) * 100)
     if score > 100:
         score = 100
     findings['security_score'] = score

mobsf/templates/static_analysis/android_binary_analysis.html

@@ -619,21 +619,22 @@ <h3>{{ providers | length }}</h3>
 <section class="content">
       <div class="container-fluid">
         <div class="row">
-            <!--<div class="col-lg-4">
-            <div class="card">
-              <div class="card-body">
-                <p>
-                <strong><i class="fas fa-cog"></i> SCAN OPTIONS</strong>
-                </p>
-                <p> <a href="../static_analyzer/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=apk&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>
-                  <a id="supbtn" onclick="list_suppressions()" role="button" class="btn btn-primary" data-target="#sup_list" data-toggle="modal" href="#"><i class="fa fa-list"></i> Manage Suppressions</a>
-                </p>
-                <p>
-                  <a onclick="dynamic_loader()" href="../android_dynamic/{{md5}}" class="btn btn-success" role="button"><i class="fa fa-play-circle"></i> Start Dynamic Analysis</a>
-                </p>
+            <div class="col-lg-4">
+              <div class="card">
+                <div class="card-body">
+                  <p>
+                  <strong><i class="fas fa-cog"></i> SCAN OPTIONS</strong>
+                  </p>
+                  <p>
+                    <!--<a href="../static_analyzer/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=apk&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>-->
+                    <a id="supbtn" onclick="list_suppressions()" role="button" class="btn btn-primary" data-target="#sup_list" data-toggle="modal" href="#"><i class="fa fa-list"></i> Manage Suppressions</a>
+                  </p>
+                  <!--<p>
+                    <a onclick="dynamic_loader()" href="../android_dynamic/{{md5}}" class="btn btn-success" role="button"><i class="fa fa-play-circle"></i> Start Dynamic Analysis</a>
+                  </p>-->
+                </div>
               </div>
             </div>
-            </div>-->
             <div class="col-lg-8">
               <div class="card">
                 <div class="card-body">
@@ -997,7 +998,7 @@ <h3>{{ providers | length }}</h3>
                             </a>
 
                             <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-                              <a style="cursor:pointer;" class="dropdown-item" onclick="suppress('{{ item|key:"title" | android_component}}{{item|key:'rule' | escapejs }}', false, $(this.closest('tr')), true)">Suppression the rule <b>{{ item|key:"title" | android_component}}{{ item|key:'rule' }}</b> in <b>{{package_name}}</b></a>
+                              <a style="cursor:pointer;" class="dropdown-item" onclick="suppress('{{ item|key:"title" | android_component}}{{item|key:'rule' | escapejs }}', false, $(this.closest('tr')), true)">Suppress the rule <b>{{ item|key:"title" | android_component}}{{ item|key:'rule' }}</b> in <b>{{package_name}}</b></a>
                             </div>
                           </div>
                         </td>

mobsf/templates/static_analysis/android_source_analysis.html

@@ -533,12 +533,8 @@ <h3>{{ providers | length }}</h3>
                 <strong><i class="fas fa-cog"></i> SCAN OPTIONS</strong>
                 </p>
                 <p align="center">
-<<<<<<< HEAD
                   <!--<a href="../static_analyzer/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=zip&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>-->
-=======
-                  <a href="../static_analyzer/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=zip&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>
                   <a id="supbtn" onclick="list_suppressions()" role="button" class="btn btn-primary" data-target="#sup_list" data-toggle="modal" href="#"><i class="fa fa-list"></i> Manage Suppressions</a>
->>>>>>> 037caac135ba5d9a5d77af80a70b7cdafa653b5d
                   <a target="_blank" href="../manifest_view/?md5={{ md5 }}&amp;type={{ app_type }}&amp;bin=0" role="button" class="btn btn-primary"><i class="fa fa-eye"></i>  View AndroidManifest.xml</a>
                   <a href="{% url "tree_view" %}?md5={{ md5 }}&amp;type=java" class="btn btn-info" role="button"><i class="fa fa-code"></i> View Source</a>
                 </p>

mobsf/templates/static_analysis/ios_binary_analysis.html

@@ -396,13 +396,9 @@ <h5 class="card-title"></h5>
                 <p>
                   <strong><i class="fas fa-cog"></i> SCAN OPTIONS</strong>
                 </p>
-<<<<<<< HEAD
                 <p>
-                  <!--<a role="button" class="btn btn-info" href="../static_analyzer_ios/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=ipa&amp;rescan=1" ><i class="fa fa-sync"></i> Rescan</a>-->
-=======
-                 <a role="button" class="btn btn-info" href="../static_analyzer_ios/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=ipa&amp;rescan=1" ><i class="fa fa-sync"></i> Rescan</a>
+                 <!--<a role="button" class="btn btn-info" href="../static_analyzer_ios/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=ipa&amp;rescan=1" ><i class="fa fa-sync"></i> Rescan</a>-->
                  <a id="supbtn" onclick="list_suppressions()" role="button" class="btn btn-primary" data-target="#sup_list" data-toggle="modal" href="#"><i class="fa fa-list"></i> Manage Suppressions</a>
->>>>>>> 037caac135ba5d9a5d77af80a70b7cdafa653b5d
                 </p>
               </div>
             </div><!-- /.card -->

mobsf/templates/static_analysis/ios_source_analysis.html

@@ -361,12 +361,8 @@ <h5 class="card-title"></h5>
                 <strong><i class="fas fa-cog"></i> SCAN OPTIONS</strong>
                 </p>
                 <p align="center">
-<<<<<<< HEAD
                   <!--<a href="../static_analyzer_ios/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=ios&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>-->
-=======
-                  <a href="../static_analyzer_ios/?checksum={{ md5 }}&amp;name={{ file_name }}&amp;type=ios&amp;rescan=1" class="btn btn-info" role="button"><i class="fa fa-sync"></i> Rescan</a>
                   <a id="supbtn" onclick="list_suppressions()" role="button" class="btn btn-primary" data-target="#sup_list" data-toggle="modal" href="#"><i class="fa fa-list"></i> Manage Suppressions</a>
->>>>>>> 037caac135ba5d9a5d77af80a70b7cdafa653b5d
                   <a data-target="#mplist" role="button" class="btn btn-primary" data-toggle="modal" href="#"><i class="fa fa-list"></i> View Info.plist</a>
                </p>
               </div>