version check

Dockerfile

@@ -9,7 +9,6 @@ ENV USER=pi USER_ID=1000 USER_GID=1000 TZ=Europe/London PORT=20211
 RUN apt-get update \
     && apt-get install --no-install-recommends tini ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools python3 iproute2 nmap python3-pip zip -y \
     && pip3 install requests paho-mqtt scapy cron-converter pytz \    
-    # && pip3 install requests paho-mqtt ssdpy upnpclient \
     && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
     && apt-get clean autoclean \
     && apt-get autoremove \
@@ -40,7 +39,9 @@ RUN rm /etc/nginx/sites-available/default \
     # Create a backup of the pialert.conf to be used if the user didn't supply a configuration file
     && cp /home/pi/pialert/config/pialert.conf /home/pi/pialert/back/pialert.conf_bak \
     # Create a backup of the pialert.db to be used if the user didn't supply a database
-    && cp /home/pi/pialert/db/pialert.db /home/pi/pialert/back/pialert.db_bak 
+    && cp /home/pi/pialert/db/pialert.db /home/pi/pialert/back/pialert.db_bak \
+    # Create a buildtimestamp.txt to later check if a new version was released
+    && date +%s > /home/pi/pialert/front/buildtimestamp.txt
 
 ENTRYPOINT ["tini", "--"]
 

back/pialert.py

@@ -641,6 +641,8 @@ def main ():
         # re-load user configuration
         importConfig() 
 
+        isNewVersion()
+
         # proceed if 1 minute passed
         if last_run + datetime.timedelta(minutes=1) < time_started :
 
@@ -2224,6 +2226,9 @@ def send_notifications ():
 
     # Open html Template
     template_file = open(PIALERT_BACK_PATH + '/report_template.html', 'r') 
+    if isNewVersion():
+        template_file = open(PIALERT_BACK_PATH + '/report_template_new_version.html', 'r') 
+
     mail_html = template_file.read() 
     template_file.close() 
 
@@ -2235,6 +2240,8 @@ def send_notifications ():
     mail_text = mail_text.replace ('<SERVER_NAME>', socket.gethostname() )
     mail_html = mail_html.replace ('<SERVER_NAME>', socket.gethostname() )
 
+    
+
     if 'internet' in INCLUDED_SECTIONS:
         # Compose Internet Section        
         mail_section_Internet = False
@@ -3218,6 +3225,34 @@ def hide_email(email):
 
     return email    
 
+#-------------------------------------------------------------------------------
+def isNewVersion():    
+
+    f = open(pialertPath + '/front/buildtimestamp.txt', 'r') 
+    buildTimestamp = int(f.read().strip())
+    f.close() 
+
+    url = requests.get("https://api.github.com/repos/jokob-sk/Pi.Alert/releases")
+    text = url.text
+
+    data = json.loads(text)
+    
+    # Debug
+    write_file (logPath + '/pialert_version_new.json', json.dumps(data)) 
+
+    # make sure we received a valid response and not an API rate limit exceeded message
+    if len(data) > 0:
+    
+        dateTimeStr = data[0]["published_at"]
+
+        realeaseTimestamp = int(datetime.datetime.strptime(dateTimeStr, '%Y-%m-%dT%H:%M:%SZ').strftime('%s'))
+
+        if realeaseTimestamp > buildTimestamp + 600:        
+            file_print("here")
+            return True    
+
+    return False
+
 #-------------------------------------------------------------------------------
 # Cron-like Scheduling
 #-------------------------------------------------------------------------------

back/report_template.html

@@ -36,7 +36,7 @@
             <p style="font-size: 24px; font-weight: bold; color:#C04040"> Internet: </p> 
 
             <table width=100% border=1 bordercolor=#C0C0C0 cellpadding=3px cellspacing=0 style="border-collapse: collapse; font-size: 12px; color:#707070">
-                <tr bgcolor=#909090 style="color:#F0F0F0">
+                <tr bgcolor=#909090 style="color:#f0f0f0">
                     <th width=140> Event Type </th>
                     <th width=130> Datetime </th>
                     <th width=100> IP </th>

back/report_template_new_version.html

@@ -0,0 +1,120 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  repot_template.html - Back module. Template to email reporting in HTML format
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
+<html>
+
+<head>
+</head>
+
+<body>
+    <font face=sans-serif>
+    <table align=center width=100% cellpadding=0 cellspacing=0 style="border-radius: 5px;">
+        <tr>
+        <td bgcolor=#EFB956  align=center style="padding: 20px 10px 10px 10px; font-size: 30px; font-weight: bold; color:#000000; border-top-right-radius: 5px; border-top-left-radius: 5px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2)">
+            Pi.Alert Report
+        </td>
+        </tr>
+        <tr> 
+            <td bgcolor=#2656f1 width=100% align=center style="padding: 20px 10px 10px 10px; font-size: 20px; font-weight: bold; color:#ffffff; border-top-right-radius: 5px; border-top-left-radius: 5px; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2)">🆕 New <a style="color:#ffffff" href="https://github.com/jokob-sk/Pi.Alert/releases">version</a> available 🆕</td>
+        </tr>
+        <tr>
+        <td>
+            <table width=100% border=0 bgcolor=#FFD966 cellpadding=5px cellspacing=0 style="border-collapse: collapse; font-size: 15px; text-align:center; color:#404040">            <tr>
+                <td width=100%> Report Date: <b><REPORT_DATE></b> </td>
+            </tr>
+            </table>
+        </td>
+        </tr>
+
+        <tr>
+        <td bgcolor=#F5F5F5 height=200 valign=top style="padding: 10px">
+            <SECTION_INTERNET>
+            <p style="font-size: 24px; font-weight: bold; color:#C04040"> Internet: </p> 
+
+            <table width=100% border=1 bordercolor=#C0C0C0 cellpadding=3px cellspacing=0 style="border-collapse: collapse; font-size: 12px; color:#707070">
+                <tr bgcolor=#909090 style="color:#f0f0f0">
+                    <th width=140> Event Type </th>
+                    <th width=130> Datetime </th>
+                    <th width=100> IP </th>
+                    <th> Additional Info </th>
+                </tr>
+
+                <TABLE_INTERNET>
+            </table>
+
+            <br>
+            </SECTION_INTERNET>
+
+            <SECTION_NEW_DEVICES>
+            <p style="font-size: 14px; font-weight: bold; color:#C04040"> New Devices: </p> 
+
+            <table width=100% border=1 bordercolor=#C0C0C0 cellpadding=3px cellspacing=0 style="border-collapse: collapse; font-size: 12px; color:#707070">
+                <tr bgcolor=#909090 style="color:#F0F0F0">
+                    <th width=150> MAC </th>
+                    <th width=130> Datetime </th>
+                    <th width=100> IP </th>
+                    <th width=140> Device Name </th>
+                    <th> Vendor </th>
+                </tr>
+
+                <TABLE_NEW_DEVICES>
+            </table>
+
+            <br>
+            </SECTION_NEW_DEVICES>
+
+            <SECTION_DEVICES_DOWN>
+            <p style="font-size: 14px; font-weight: bold; color:#C04040"> Devices Down: </p> 
+
+            <table width=100% border=1 bordercolor=#C0C0C0 cellpadding=3px cellspacing=0 style="border-collapse: collapse; font-size: 12px; color:#707070">
+                <tr bgcolor=#909090 style="color:#F0F0F0">
+                    <th width=140> MAC </th>
+                    <th width=130> Datetime </th>
+                    <th width=100> IP </th>
+                    <th> Device Name </th>
+                </tr>
+
+                <TABLE_DEVICES_DOWN>
+            </table>
+
+            <br>
+            </SECTION_DEVICES_DOWN>
+
+            <SECTION_EVENTS>
+            <p style="font-size: 14px; font-weight: bold; color:#409040"> Events: </p> 
+
+            <table width=100% border=1 bordercolor=#C0C0C0 cellpadding=3px cellspacing=0 style="border-collapse: collapse; font-size: 12px; color:#707070">
+                <tr bgcolor=#909090 style="color:#F0F0F0">
+                    <th width=140> MAC </th>
+                    <th width=130> Datetime </th>
+                    <th width=100> IP </th>
+                    <th width=100> Event Type </th>
+                    <th width=140> Device Name </th>
+                    <th> Additional Info </th>
+                </tr>
+
+                <TABLE_EVENTS>
+            </table>
+            </SECTION_EVENTS>
+        </td>
+        </tr>
+        
+        <tr>
+        <td>
+            <table width=100% bgcolor=#46802e cellpadding=5px cellspacing=0 style="font-size: 13px; font-weight: bold; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
+               <tr>
+                    <td width=50% style="text-align:center"> Pi.Alert - <SERVER_NAME></td>                    
+                </tr>
+            </table>
+        </td>
+        </tr>
+    </table>
+    </font>
+</body>
+</html>

front/css/pialert.css

@@ -666,10 +666,10 @@ height: 50px;
     width:46%;
 }
 
-/* .setting_input
+.myhidden
 {
-    width:35%;
-} */
+    display:none;
+}
 
 .center 
 {
@@ -703,3 +703,12 @@ height: 50px;
 {
     cursor: pointer;
 }
+
+.new-version
+{   
+    top: -6px;
+    position: absolute;
+    z-index: 1;
+    left: 0px;
+    font-size: large;
+}

front/js/handle_version.js

@@ -0,0 +1,60 @@
+function handleVersion(){
+
+    release_timestamp = getCookie("release_timestamp")
+
+    if(release_timestamp != "")
+    {
+
+      build_timestamp = parseInt($('#version').attr("data-build-time").match(  /\d+/g ).join(''))
+
+      // if the release_timestamp is older by 10 min or more as the build timestamp then there is a new release available 
+      if(release_timestamp > build_timestamp + 600 )
+      {
+        console.log("New release!")
+        $('#version').attr("class", $('#version').attr("class").replace("myhidden", ""))
+        $('#new-version-text').attr("class", $('#new-version-text').attr("class").replace("myhidden", ""))
+        
+      }
+      else{
+        console.log("All up-to-date!")        
+        $('#current-version-text').attr("class", $('#current-version-text').attr("class").replace("myhidden", ""))        
+      }
+    } 
+
+  }  
+
+  //--------------------------------------------------------------
+
+  function getVersion()
+  {
+    release_timestamp = getCookie("release_timestamp")
+
+    // no cached value available
+    if(release_timestamp == "")
+    {
+      // get parameter value
+      $.get('https://api.github.com/repos/jokob-sk/Pi.Alert/releases', function(data) {
+        
+        var releases = data;
+
+        if(releases.length > 0)
+        {
+          release_datetime = releases[0].published_at;
+          release_timestamp = new Date(release_datetime).getTime() / 1000;          
+
+          // cache value
+          setCookie("release_timestamp", release_timestamp, 5);
+
+          handleVersion();
+        }
+      });
+    } else
+    {
+      // cache is available, just call the handler
+      handleVersion()
+    }
+  }
+
+
+// handle the dispaly of the NEW icon
+getVersion()

front/js/pialert_common.js

@@ -34,11 +34,70 @@ function setCache(key, data)
 
 
 // -----------------------------------------------------------------------------
-function setCookie (cookie, value, expirationHours='') {
+
+function handleVersion(){
+
+  release_timestamp = getCookie("release_timestamp")
+
+  if(release_timestamp != "")
+  {
+
+    build_timestamp = parseInt($('#version').attr("data-build-time").match(  /\d+/g ).join(''))
+
+    // if the release_timestamp is older by 10 min or more as the build timestamp then there is a new release available 
+    if(release_timestamp > build_timestamp + 600 )
+    {
+      console.log("New release!")
+      $('#version').attr("class", $('#version').attr("class").replace("myhidden", ""))
+      
+    }
+    else{
+      console.log("All up-to-date!")
+      $('#current-version-text').attr("class", $('#current-version-text').attr("class").replace("myhidden", ""))
+      // new-version-text current-version-text
+    }
+  } 
+
+}  
+
+//--------------------------------------------------------------
+
+function getVersion()
+{
+  release_timestamp = getCookie("release_timestamp")
+
+  // no cached value available
+  if(release_timestamp == "")
+  {
+    // get parameter value
+    $.get('https://api.github.com/repos/jokob-sk/Pi.Alert/releases', function(data) {
+      
+      var releases = data;
+
+      if(releases.length > 0)
+      {
+        release_datetime = releases[0].published_at;
+        release_timestamp = new Date(release_datetime).getTime() / 1000;          
+
+        // cache value
+        setCookie("release_timestamp", release_timestamp ,5);
+
+        handleVersion();
+      }
+    });
+  } else
+  {
+    // cache is available, just call the handler
+    handleVersion()
+  }
+}
+
+// -----------------------------------------------------------------------------
+function setCookie (cookie, value, expirationMinutes='') {
   // Calc expiration date
   var expires = '';
-  if (typeof expirationHours === 'number') {
-    expires = ';expires=' + new Date(Date.now() + expirationHours *60*60*1000).toUTCString();
+  if (typeof expirationMinutes === 'number') {
+    expires = ';expires=' + new Date(Date.now() + expirationMinutes *60*1000).toUTCString();
   }
 
   // Save Cookie

front/maintenance.php

@@ -154,6 +154,12 @@ if (isset($_POST['submit']) && submit && isset($_POST['skinselector_set'])) {
               </div>
               <div class="box-body" style="padding-bottom: 5px;">
                 <div class="db_info_table">
+                    <div class="db_info_table_row">
+                        <div class="db_info_table_cell" style="min-width: 140px"><?php echo lang('Maintenance_version');?></div>
+                        <div class="db_info_table_cell">
+                        <div class="version" id="version" data-build-time="<?php echo file_get_contents( "buildtimestamp.txt");?>"><?php echo '<span id="new-version-text" class="myhidden">' .lang('Maintenance_new_version').'</span>'.'<span id="current-version-text" class="myhidden">' .lang('Maintenance_current_version').'</span>';?></div>
+                        </div>
+                    </div>
                     <div class="db_info_table_row">
                         <div class="db_info_table_cell" style="min-width: 140px"><?php echo lang('Maintenance_database_path');?></div>
                         <div class="db_info_table_cell">
@@ -811,3 +817,4 @@ window.onload = function asyncFooter()
 </script>
 
 
+

front/php/templates/footer.php

@@ -51,6 +51,7 @@
 
 <!-- Pi.Alert -------------------------------------------------------------- -->
   <script src="js/pialert_common.js"></script>
+  <script src="js/handle_version.js"></script>
 
 </body>
 </html>

front/php/templates/header.php

@@ -223,6 +223,7 @@ if ($ENABLED_DARKMODE === True) {
         </li>
 
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
+          <div class="new-version myhidden" id="version" data-build-time="<?php echo file_get_contents( "buildtimestamp.txt");?>">🆕</div>
           <a href="maintenance.php"><i class="fa fa-wrench "></i> <span><?php echo lang('Navigation_Maintenance');?></span></a>
         </li>
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('settings.php') ) ){ echo 'active'; } ?>">
@@ -239,8 +240,13 @@ if ($ENABLED_DARKMODE === True) {
     <!-- /.sidebar -->
   </aside>
 
+<script src="js/pialert_common.js"></script>
 <script defer>
 
+//--------------------------------------------------------------
+
+  
+  //--------------------------------------------------------------
   function getParam(targetId, key, skipCache = false) {  
 
     skipCacheQuery = "";
@@ -259,11 +265,15 @@ function getParam(targetId, key, skipCache = false) {
     });
   }
 
+  //--------------------------------------------------------------
+
   // Update server time in the header
   show_pia_servertime()
 
   // Update server state in the header
   updateState()
 
+
+
 </script>
 

front/php/templates/language/en_us.php

@@ -216,6 +216,9 @@ $lang['en_us'] = array(
 //////////////////////////////////////////////////////////////////
 
 'Maintenance_Title' => 'Maintenance tools',
+'Maintenance_version' => 'Application updates',
+'Maintenance_new_version' => '🆕 A new version is available. Check out the <a href="https://github.com/jokob-sk/Pi.Alert/releases" target="_blank">release notes</a>.',
+'Maintenance_current_version' => 'You are up-to-date. Check out what <a href="https://github.com/jokob-sk/Pi.Alert/issues/138" target="_blank">I\'m working on</a>.',
 'Maintenance_database_path' => 'Database-Path',
 'Maintenance_database_size' => 'Database-Size',
 'Maintenance_database_lastmod' => 'Last Modification',
@@ -432,6 +435,7 @@ $lang['en_us'] = array(
 'settings_missing' => 'Not all settings loaded, refresh the page! This is probably caused by a high load on the database.',
 'settings_missing_block' => 'You can\'t save your settings without specifying all setting keys. Refresh the page. This is probably caused by a high load on the database.',
 'settings_old' => 'The settings in the DB (shown on this page) are outdated. This is probably caused by a running scan. The settings were saved in the <code>pialert.conf</code> file, but the background process didn\'t have time to import it yet to the DB. You can wait until the settings get refreshed so you don\'t overwrite your old values. Feel free to save your settings either way if you don\'t mind losing the settings between the last save and now. There are also backup files created if you need to compare your settings later.',
+'settings_imported' => 'Last time settings were imported from the pialert.conf file:',
 
 //General
 'SCAN_SUBNETS_name' => 'Subnets to scan',

front/settings.php

@@ -51,7 +51,7 @@ CommitDB();
       <h1 id="pageTitle">
          <?php echo lang('Navigation_Settings');?>
       </h1>
-      Last time imported from the pialert.conf file: <span id="lastImportedTime"></span>
+      <div class="settingsImported"><?php echo lang("settings_imported");?> <span id="lastImportedTime"></span></div>      
     </section>
     <div class="content">
    <?php