Merge pull request #58 from KasperskyLab/dev

Adding few features.

app/frontend/src/assets/custom.css

@@ -694,6 +694,16 @@ ul {
     opacity: 0.2;
 }
 
+.home-icon {
+    background-image: url("data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9JzMwMHB4JyB3aWR0aD0nMzAwcHgnICBmaWxsPSIjMjUyNTI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNTY2LjkzIDU2Ni45MyIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNTY2LjkzIDU2Ni45MyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGcgZGlzcGxheT0ibm9uZSI+PGcgZGlzcGxheT0iaW5saW5lIj48Y2lyY2xlIGN4PSIzMzcuODUxIiBjeT0iMjQ1LjA5MyIgcj0iNjguMTAzIj48L2NpcmNsZT48cGF0aCBkPSJNMjgzLjU0NSwyNC4wMDdjLTE0NS42ODIsMC0yNjMuNzgxLDExOC4wOTktMjYzLjc4MSwyNjMuNzgxczExOC4wOTksMjYzLjc4MSwyNjMuNzgxLDI2My43ODEgICAgUzU0Ny4zMjYsNDMzLjQ3LDU0Ny4zMjYsMjg3Ljc4OFM0MjkuMjI3LDI0LjAwNywyODMuNTQ1LDI0LjAwN3ogTTQxOC41NTIsMzI1Ljc5NGMtMzUuODk4LDM1Ljg5OC04OS42OTIsNDIuOTItMTMyLjQ4MiwyMC45MzQgICAgbC03Ni43MDksNzYuNzA5Yy0xMy42NTEsMTMuNjUxLTM1Ljc4MywxMy42NTEtNDkuNDM0LDBjLTEzLjY1MS0xMy42NTEtMTMuNjUxLTM1Ljc4NCwwLTQ5LjQzNWw3Ni43NzctNzYuNzc3ICAgIGMtMjEuOTIzLTQyLjg1My0xNS4wNi05Ni42OTksMjAuNzYxLTEzMi41MmM0NC40ODMtNDQuNDgzLDExNi40NDgtNDQuNjQsMTYwLjkzMS0wLjE1NyAgICBDNDYyLjg3OCwyMDkuMDMzLDQ2My4wMzUsMjgxLjMxMSw0MTguNTUyLDMyNS43OTR6Ij48L3BhdGg+PC9nPjwvZz48ZyBkaXNwbGF5PSJub25lIj48ZyBkaXNwbGF5PSJpbmxpbmUiPjxwYXRoIGQ9Ik0yODIsMjExLjY3NmMtNy44MDEsMC0xMyw2LjMyNC0xMywxNC4xMjVWMjkyaC00MC42ODJjLTcuOTc1LDAtMTQuMzE4LDUuOTc4LTE0LjMxOCwxMy45NTN2MC41OTcgICAgYzAsNy45NzUsNi4zNDMsMTQuNDQ5LDE0LjMxOCwxNC40NDloNTQuNjQxYzAuMDUzLDAtMC40OTUtMC4wMTItMC40NDItMC4wMTNjMC4wNTMsMC4wMDEtMC40OTUsMC4wMDQtMC40NDIsMC4wMDQgICAgYzcuODAxLDAsMTIuOTI1LTYuMzI0LDEyLjkyNS0xNC4xMjV2LTAuMzE1di0wLjU5N3YtODAuMTUyQzI5NSwyMTgsMjg5LjgwMSwyMTEuNjc2LDI4MiwyMTEuNjc2eiI+PC9wYXRoPjxwYXRoIGQ9Ik0yODMuNTQ1LDI0LjAwN2MtMTQ1LjY4MiwwLTI2My43ODEsMTE4LjA5OS0yNjMuNzgxLDI2My43ODFzMTE4LjA5OSwyNjMuNzgxLDI2My43ODEsMjYzLjc4MSAgICBTNTQ3LjMyNiw0MzMuNDcsNTQ3LjMyNiwyODcuNzg4UzQyOS4yMjcsMjQuMDA3LDI4My41NDUsMjQuMDA3eiBNMTQ0LjQyLDIzMi4wNDdjLTAuODktMS4yNzctMS41NjktMi43MDctMi4wMDMtNC4yNDQgICAgYy0zLjI3OS03LjY0OS01LjExMS0xNi4wNjYtNS4xMTEtMjQuOTE1YzAtMzQuOTk3LDI4LjM3MS02My4zNjgsNjMuMzY4LTYzLjM2OGMxNC41OSwwLDI4LjAyMyw0LjkzNywzOC43MzUsMTMuMjI0ICAgIGMxLjAxOSwwLjYzOSwxLjk1MSwxLjQsMi43NzUsMi4yNjhjMi40MzEsMi41NiwzLjkzMiw2LjAxMiwzLjkzMiw5LjgyYzAsNS42OTYtMy4zNDQsMTAuNi04LjE2OSwxMi44OTEgICAgYy0wLjgzMSwwLjM5NS0xLjcwNCwwLjcwOS0yLjYxNSwwLjkzOGMtMjcuMTMsMTAuMDYtNTAuMzAzLDI4LjI1Mi02Ni41NjcsNTEuNjJjLTAuNTU4LDEuMTE2LTEuMjU3LDIuMTQ1LTIuMDc3LDMuMDY5ICAgIGMtMi42MDEsMi45MzMtNi4zODcsNC43OTItMTAuNjE2LDQuNzkyQzE1MS4yNDQsMjM4LjE0MywxNDYuOTg2LDIzNS43MjgsMTQ0LjQyLDIzMi4wNDd6IE00MDEuNTIsNDI2Ljk1NCAgICBjLTEzLjkxLDEzLjkxLTM2LjQ2MywxMy45MS01MC4zNzMsMGwtNS41OC01LjU4Yy0xOC4xODQsMTAuMDg0LTM5LjEwNSwxNS44MzMtNjEuMzcxLDE1LjgzMyAgICBjLTIyLjEwNSwwLTQyLjg4NS01LjY2NC02MC45NzctMTUuNjEzbC01LjM2LDUuMzZjLTEzLjkxLDEzLjkxLTM2LjQ2MywxMy45MS01MC4zNzMsMGMtMTMuOTEtMTMuOTEtMTMuOTEtMzYuNDY0LDAtNTAuMzc0ICAgIGw1LjQyNC01LjQyNGMtOS44NDktMTguMDIzLTE1LjQ0OS0zOC42OTgtMTUuNDQ5LTYwLjY4M2MwLTY5Ljk5NSw1Ni43NDEtMTI2LjczNSwxMjYuNzM1LTEyNi43MzVzMTI2LjczNSw1Ni43NDEsMTI2LjczNSwxMjYuNzM1ICAgIGMwLDIxLjgyMy01LjUxOCw0Mi4zNTgtMTUuMjMyLDYwLjI4Nmw1LjgyMSw1LjgyMUM0MTUuNDMsMzkwLjQ5LDQxNS40Myw0MTMuMDQ0LDQwMS41Miw0MjYuOTU0eiBNNDI2LjI3MiwyMjkuODc3ICAgIGMtMC40MDIsMS4xMDMtMC45MjQsMi4xNDktMS41NzMsMy4xMDRjLTIuNTM2LDMuNzI3LTYuODEsNi4xNzUtMTEuNjU4LDYuMTc1Yy00LjQ4MywwLTguNDY5LTIuMDk5LTExLjA1LTUuMzYzICAgIGMtMC41MDgtMC42NDItMC45NjgtMS4zMjMtMS4zNi0yLjA0OWMtMTYuMTUzLTIzLjg0My0zOS40MzItNDIuNDU3LTY2Ljc4NC01Mi43ODhjLTEuMDQ4LTAuMjUyLTIuMDQ4LTAuNjE4LTIuOTkxLTEuMDg4ICAgIGMtNC42NzEtMi4zMjUtNy44ODgtNy4xMzMtNy44ODgtMTIuNzA1YzAtMy40ODgsMS4yNjMtNi42NzcsMy4zNDktOS4xNDhjMS4wMjUtMS4yMTUsMi4yNTQtMi4yNDUsMy42MjgtMy4wNjEgICAgYzEwLjc1My04LjQxMiwyNC4yODgtMTMuNDM0LDM5LTEzLjQzNGMzNC45OTcsMCw2My4zNjgsMjguMzcxLDYzLjM2OCw2My4zNjhDNDMyLjMxMiwyMTIuNTQ1LDQzMC4xMzcsMjIxLjY4OCw0MjYuMjcyLDIyOS44Nzd6Ij48L3BhdGg+PC9nPjwvZz48Zz48cGF0aCBkPSJNMjgzLjU0NSwyNC4wMDdjLTE0NS42ODIsMC0yNjMuNzgxLDExOC4wOTktMjYzLjc4MSwyNjMuNzgxczExOC4wOTksMjYzLjc4MSwyNjMuNzgxLDI2My43ODEgICBTNTQ3LjMyNiw0MzMuNDcsNTQ3LjMyNiwyODcuNzg4UzQyOS4yMjcsMjQuMDA3LDI4My41NDUsMjQuMDA3eiBNNDIzLDM5OS4zMDljMCw3LjQ5My02LjMxNSwxMy42OTEtMTMuODA4LDEzLjY5MUgzMTh2LTM1LjM0ICAgdi0yMC40NDZ2LTIuODcxYzAuMDM4LTcuMzctNi4xMTEtMTIuMzQzLTE1LTEyLjM0M3MtMzksMC0zOSwwYy0zLTAuMDA1LTIuMjQxLDAuMTYxLTIuMzczLDAuMTYxICAgYy03LjQzNSwwLTE0LjYyNSw3LjE2NS0xNC42MjUsMTQuNmMwLDAuMTI3LTAuMDAyLDEuMjM5LTAuMDAyLDEuMjM5djE5LjY2VjQxM2gtODkuODM3aC0wLjQ5NCAgIGMtNy4zODEsMC0xMy42NjktNi4yNzItMTMuNjY5LTEzLjY4NXYtMTIxLjUzYzAtMi44MjcsMS4wNjItNS40NDMsMi41NjgtNy41OTZjMC44ODgtMS4yNywyLjE2NC0yLjM3NSwzLjQzMS0zLjI2NSAgIGwxMjQuMDEyLTEyNC4yNjhsMi4xNTQtMi4xNTdjMi4yNTUtMS43OTEsNS4xMDYtMi44NjcsOC4yMDktMi44NjdjMy4wMDQsMCw1Ljc3MiwxLjAxNCw3Ljk5MSwyLjcwMmwyLjU1NywyLjU0OGwxMjQuOTg3LDEyNS4yMTUgICBjLTAuMDU0LDAuMDQ1LTAuMDQ3LDAuMDkxLTAuMTAxLDAuMTM2YzIuNTA1LDIuNDE1LDQuMTkxLDUuNzk5LDQuMTkxLDkuNTU0VjM5OS4zMDl6Ij48L3BhdGg+PC9nPjxnIGRpc3BsYXk9Im5vbmUiPjxnIGRpc3BsYXk9ImlubGluZSI+PHBhdGggZD0iTTM0NS4xNSwyNzEuODUxYzEuMTgzLTEuMjk3LDIuNTQ3LTIuNzA2LDMuODQyLTQuMjQ3YzEuNDIxLTEuNjkyLDIuNjU5LTMuNTQ1LDMuNDE3LTUuNTk1ICAgIGMwLjQzMy0xLjExOSwwLjcxMyLine truncated
+    width: 30px;
+    height: 30px;
+    display: block;
+    margin-right: 10px;
+    margin-top: 10px;
+    background-size: cover;
+    opacity: 0.1;
+}
 
 .off-icon:hover {
     opacity: 0.3;
@@ -705,6 +715,11 @@ ul {
     cursor:pointer;
 }
 
+.home-icon:hover {
+    opacity: 0.3;
+    cursor:pointer;
+}
+
 .update-icon:hover {
     opacity: 0.4;
     cursor:pointer;

app/frontend/src/components/Controls.vue

@@ -2,9 +2,11 @@
     <div class="controls" v-if="display">
         <i class="off-icon" v-on:click="action('shutdown')" v-if="off_available"></i>
         <i class="quit-icon" v-on:click="action('quit')" v-if="quit_available"></i>
+        <i class="home-icon" @click="$router.push({ name: 'home' })"></i>
         <i class="update-icon" v-if="update_available&&update_possible" @click="$router.push({ name: 'update' })"></i>
     </div>
 </template>
+
 <script>
 import axios from 'axios'
 

app/frontend/src/views/splash-screen.vue

@@ -46,7 +46,7 @@
             }
         },
         created: function() {
-            setTimeout(function () { this.internet_check(); }.bind(this), 1000);
+            setTimeout(function () { this.internet_check(); }.bind(this), 5000);
         }
     }
 </script>

server/frontend/app/classes/network.py

@@ -290,8 +290,14 @@ class Network(object):
         try:
             sp.Popen("echo 1 > /proc/sys/net/ipv4/ip_forward",
                      shell=True).wait()
+
+            # Enable forwarding.
             sp.Popen(["iptables", "-A", "POSTROUTING", "-t", "nat", "-o",
                       self.iface_out, "-j", "MASQUERADE"]).wait()
+
+            # Prevent the device to reach the 80 of TinyCheck.
+            sp.Popen(["iptables", "-A", "INPUT", "-i", self.iface_in, "-d",
+                      "192.168.100.1", "-p", "tcp", "--dport", "80", "-j" "DROP"]).wait()
             return True
         except:
             return False