Update app.py

app.py

@@ -7,11 +7,59 @@ import easy_db
 def get_db_path():
     return "device_data.db"
 
+def is_verifying_and_good_boot_state(dict_of_device_data_to_save):
+    if dict_of_device_data_to_save["verify"] == "enforcing" and dict_of_device_data_to_save["boot_state"] == "green":
+        return True
+    return False
+
+def is_debug_enabled(dict_of_device_data_to_save):
+    if dict_of_device_data_to_save["debug_enabled"] == False:
+        return False
+    else:
+        return True
+
+def is_installer_google(dict_of_device_data_to_save):
+    if dict_of_device_data_to_save["installer"] == True:
+        return True
+    else:
+        return False
+
+def is_in_emulator(dict_of_device_data_to_save):
+    if dict_of_device_data_to_save["emulator"] == True:
+        return False
+    else:
+        return True
+
+def do_certs_match(previous_entries_for_device,dict_of_device_data_to_save):
+    for entry in previous_entries_for_device:
+        if entry["primary_certificate"] != dict_of_device_data_to_save["primary_certificate"]:
+            return False
+
+    return True
+
+def get_num_differences(previous_entries_for_device,dict_of_device_data_to_save):
+    differences = []
+    for previous_entry in previous_entries_for_device:
+        difference = 0
+        for key in list(dict_of_device_data_to_save.keys()):
+            if dict_of_device_data_to_save[key] != previous_entry[key]:
+                difference = difference + 1
+        differences.append(difference)
+
+    if len(differences) != 0:
+        max_difference = max(differences)
+    else:
+        max_difference = 0
+
+    return max_difference
+
 def process_request(id_textbox, installer_textbox,boot_state_textbox,verify_textbox,patch_level_textbox,
                                           oem_textbox,brand_textbox,model_textbox,unlocked_textbox,debug_enabled_textbox,
                                           primary_certificate_textbox,emulator_textbox,fingerprint_status_textbox,storage_encryption_status_textbox,
                                           market_apps_enabled_textbox,adb_enabled_textbox,lock_screen_timeout_textbox,
                                           lock_screen_type_textbox,notification_visibility_textbox):
+    results = []
+
     dict_of_device_data_to_save = {"id": id_textbox,
                                    "installer": installer_textbox,
                                    "boot_state": boot_state_textbox,
@@ -33,35 +81,33 @@ def process_request(id_textbox, installer_textbox,boot_state_textbox,verify_text
                                    "notification_visibility": notification_visibility_textbox}
     db = easy_db.DataBase('device_data.db')
 
+
+    results.append(not is_debug_enabled(dict_of_device_data_to_save))
+    results.append(not is_in_emulator(dict_of_device_data_to_save))
+    results.append(is_installer_google(dict_of_device_data_to_save))
+    results.append(is_verifying_and_good_boot_state(dict_of_device_data_to_save))
+
+
     table_names = db.table_names()
     if 'devices' in table_names:
         previous_entries_for_device = db.pull_where('devices', 'id = "{}"'.format(id_textbox))
         if previous_entries_for_device:
+            max_difference = get_num_differences(previous_entries_for_device, dict_of_device_data_to_save)
+            certs_match = do_certs_match(previous_entries_for_device, dict_of_device_data_to_save)
+            results.append(certs_match)
 
-            differences = []
-            for previous_entry in previous_entries_for_device:
-                difference = 0
-                for key in list(dict_of_device_data_to_save.keys()):
-                    if dict_of_device_data_to_save[key] != previous_entry[key]:
-                        difference = difference + 1
-                differences.append(difference)
-
-            if len(differences) != 0:
-                max_difference = max(differences)
-            else:
-                max_difference = 0
 
-            print("Previous entries found {} - differences in them and this entry {}".format(len(previous_entries_for_device), max_difference))
-        else:
-            print("No previous entries found")
 
     pprint(dict_of_device_data_to_save)
 
     db.append('devices', [dict_of_device_data_to_save])
 
 
+    negative_results = results.count(False)
+    result = negative_results/ len(results)
+    result = result * 100
     history = []
-    history.append(["Initialisation error!", "Please tune the model by using the above options"])
+    history.append(["Integrity Check Complete", result])
     return history
 
 
@@ -71,34 +117,100 @@ block = gr.Blocks(css=".container { max-width: 800px; margin: auto; } h1 { margi
 
 db = easy_db.DataBase('device_data.db')
 
+html_data = '''
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+<style>
+body,h1,h2,h3,h4,h5 {font-family: "Poppins", sans-serif}
+body {font-size: 16px;}
+img {margin-bottom: -8px;}
+.mySlides {display: none;}
+</style>
+</head>
+<body class="w3-content w3-black" style="max-width:1500px;">
+<!-- The App Section -->
+<div class="w3-padding-large w3-white">
+  <div class="w3-row-padding-large">
+    <div class="w3-col">
+      <h1 class="w3-jumbo"><b>Runic Integrity 🗿🛡️</b></h1>
+      <h1 class="w3-xxxlarge w3-text-blue"><b>Remove Unfavorable Tweets From Your Feed </b></h1>
+      <p><span class="w3-xlarge">Download the Android App To Use Runic Integrity. ⬇ </span> Runic Integrity is an Android application designed to assess the integrity of a device and report that back to applications on that device for safety checks.</p>
+      <a href="#"><button class="w3-button w3-light-grey w3-padding-large w3-section " onclick="document.getElementById('download').style.display='block'">
+        <i class=""></i> Find Out More! 💬
+      </button></a>
+      <a href="https://ko-fi.com/jamesstevenson"><button class="w3-button w3-light-grey w3-padding-large w3-section " onclick="document.getElementById('download').style.display='block'">
+        <i class=""></i> Support The Creator! ❤
+      </button></a>
+            <a href="https://twitter.com/_JamesStevenson"><button class="w3-button w3-light-grey w3-padding-large w3-section " onclick="document.getElementById('download').style.display='block'">
+        <i class=""></i> Follow The Creator! 🐦
+      </button></a>
+    </div>
+  </div>
+</div>
+<!-- Modal -->
+<script>
+// Slideshow
+var slideIndex = 1;
+showDivs(slideIndex);
+function plusDivs(n) {
+  showDivs(slideIndex += n);
+}
+function showDivs(n) {
+  var i;
+  var x = document.getElementsByClassName("mySlides");
+  if (n > x.length) {slideIndex = 1}
+  if (n < 1) {slideIndex = x.length}
+  for (i = 0; i < x.length; i++) {
+    x[i].style.display = "none";  
+  }
+  x[slideIndex-1].style.display = "block";  
+}
+</script>
+<br>
+</body>
+</html>
+'''
+
+
 with block:
-    chatbot = gr.Chatbot().style(color_map=("green", "pink"))
-    download_db_file = gr.File(value="device_data.db", interactive=False, label="Device Database")
-    # ID
-    id_textbox = gr.Textbox(label="Android Secure ID")
-    # Misc
-    installer_textbox = gr.Textbox(label="Installer")
-    debug_enabled_textbox = gr.Textbox(label="Debug Enabled")
-    primary_certificate_textbox = gr.Textbox(label="primary_certificate")
-    emulator_textbox = gr.Textbox(label="Emulator")
-    # Device Data
-    boot_state_textbox = gr.Textbox(label="Verify Boot State")
-    verify_textbox = gr.Textbox(label="Verify Mode")
-    patch_level_textbox = gr.Textbox(label="Security Patch Level")
-    oem_textbox = gr.Textbox(label="OEM Unlock Supported")
-    brand_textbox = gr.Textbox(label="Product Brand")
-    model_textbox = gr.Textbox(label="Product Model")
-    unlocked_textbox = gr.Textbox(label="OEM Unlock Status")
-    # Settings
-    fingerprint_status_textbox = gr.Textbox(label="Fingerprint Status")
-    storage_encryption_status_textbox = gr.Textbox(label="Storage Encryption Status")
-    market_apps_enabled_textbox = gr.Textbox(label="Market Apps Enabled")
-    adb_enabled_textbox = gr.Textbox(label="ADB Enabled")
-    lock_screen_timeout_textbox = gr.Textbox(label="Lock Screen Timeout")
-    lock_screen_type_textbox = gr.Textbox(label="Lock Screen Type")
-    notification_visibility_textbox = gr.Textbox(label="Lock Screen Type")
-
-    btn = gr.Button(label="Submit Data")
+    gr.HTML(value=html_data)
+    with gr.Group():
+        with gr.Row().style(equal_height=True):
+            download_db_file = gr.File(value="device_data.db", interactive=False, label="Device Database")
+
+            with gr.Accordion("Open for More!", visible=False):
+                chatbot = gr.Chatbot().style(color_map=("green", "pink"))
+                # ID
+                id_textbox = gr.Textbox(label="Android Secure ID")
+                # Misc
+                installer_textbox = gr.Textbox(label="Installer")
+                debug_enabled_textbox = gr.Textbox(label="Debug Enabled")
+                primary_certificate_textbox = gr.Textbox(label="primary_certificate")
+                emulator_textbox = gr.Textbox(label="Emulator")
+                # Device Data
+                boot_state_textbox = gr.Textbox(label="Verify Boot State")
+                verify_textbox = gr.Textbox(label="Verify Mode")
+                patch_level_textbox = gr.Textbox(label="Security Patch Level")
+                oem_textbox = gr.Textbox(label="OEM Unlock Supported")
+                brand_textbox = gr.Textbox(label="Product Brand")
+                model_textbox = gr.Textbox(label="Product Model")
+                unlocked_textbox = gr.Textbox(label="OEM Unlock Status")
+                # Settings
+                fingerprint_status_textbox = gr.Textbox(label="Fingerprint Status")
+                storage_encryption_status_textbox = gr.Textbox(label="Storage Encryption Status")
+                market_apps_enabled_textbox = gr.Textbox(label="Market Apps Enabled")
+                adb_enabled_textbox = gr.Textbox(label="ADB Enabled")
+                lock_screen_timeout_textbox = gr.Textbox(label="Lock Screen Timeout")
+                lock_screen_type_textbox = gr.Textbox(label="Lock Screen Type")
+                notification_visibility_textbox = gr.Textbox(label="Lock Screen Type")
+
+                btn = gr.Button(label="Submit Data")
     btn.click(fn=process_request, inputs=[id_textbox, installer_textbox,boot_state_textbox,verify_textbox,patch_level_textbox,
                                           oem_textbox,brand_textbox,model_textbox,unlocked_textbox,debug_enabled_textbox,
                                           primary_certificate_textbox,emulator_textbox,fingerprint_status_textbox,storage_encryption_status_textbox,