update_migrate_1804_2004.sh

deeztek · Sep 22, 2023 · 2f371d4 · 2f371d4
1 parent a7eb9ed
commit 2f371d4
Show file tree

Hide file tree

Showing 67 changed files with 57 additions and 286 deletions.
diff --git a/dirstructure/var/www/html/admin/2/add_internal_recipients.cfm b/dirstructure/var/www/html/admin/2/add_internal_recipients.cfm
diff --git a/dirstructure/var/www/html/admin/2/edit_ad_connection.cfm b/dirstructure/var/www/html/admin/2/edit_ad_connection.cfm
diff --git a/dirstructure/var/www/html/admin/2/edit_antivirus_signature_feed.cfm b/dirstructure/var/www/html/admin/2/edit_antivirus_signature_feed.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/add_serial_number.cfm b/dirstructure/var/www/html/admin/2/inc/add_serial_number.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/check_system_update.cfm b/dirstructure/var/www/html/admin/2/inc/check_system_update.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/delete_system_certificate.cfm b/dirstructure/var/www/html/admin/2/inc/delete_system_certificate.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/dmi_decode.cfm b/dirstructure/var/www/html/admin/2/inc/dmi_decode.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/download_csr.cfm b/dirstructure/var/www/html/admin/2/inc/download_csr.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/download_system_update.cfm b/dirstructure/var/www/html/admin/2/inc/download_system_update.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/download_system_update_log.cfm b/dirstructure/var/www/html/admin/2/inc/download_system_update_log.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/edit_console_settings.cfm b/dirstructure/var/www/html/admin/2/inc/edit_console_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/edit_smtp_tls_settings.cfm b/dirstructure/var/www/html/admin/2/inc/edit_smtp_tls_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/edit_system_settings.cfm b/dirstructure/var/www/html/admin/2/inc/edit_system_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/generate_antivirus_signatures_feed.cfm b/dirstructure/var/www/html/admin/2/inc/generate_antivirus_signatures_feed.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/generate_csr.cfm b/dirstructure/var/www/html/admin/2/inc/generate_csr.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/generate_hermes_key.cfm b/dirstructure/var/www/html/admin/2/inc/generate_hermes_key.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/generate_nginx_configuration.cfm b/dirstructure/var/www/html/admin/2/inc/generate_nginx_configuration.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/generate_tls_policy.cfm b/dirstructure/var/www/html/admin/2/inc/generate_tls_policy.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/get_antivirus_signature_feed.cfm b/dirstructure/var/www/html/admin/2/inc/get_antivirus_signature_feed.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/get_console_settings.cfm b/dirstructure/var/www/html/admin/2/inc/get_console_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/get_smtp_tls_policies.cfm b/dirstructure/var/www/html/admin/2/inc/get_smtp_tls_policies.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/get_smtp_tls_settings.cfm b/dirstructure/var/www/html/admin/2/inc/get_smtp_tls_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/get_system_settings.cfm b/dirstructure/var/www/html/admin/2/inc/get_system_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/import_system_certificate.cfm b/dirstructure/var/www/html/admin/2/inc/import_system_certificate.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/install_system_update.cfm b/dirstructure/var/www/html/admin/2/inc/install_system_update.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/request_acme_certificate.cfm b/dirstructure/var/www/html/admin/2/inc/request_acme_certificate.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/send_telemetry.cfm b/dirstructure/var/www/html/admin/2/inc/send_telemetry.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/setsession.cfm b/dirstructure/var/www/html/admin/2/inc/setsession.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/update_system_update_check.cfm b/dirstructure/var/www/html/admin/2/inc/update_system_update_check.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/update_telemetry.cfm b/dirstructure/var/www/html/admin/2/inc/update_telemetry.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/updates_show_new.cfm b/dirstructure/var/www/html/admin/2/inc/updates_show_new.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/updates_show_old.cfm b/dirstructure/var/www/html/admin/2/inc/updates_show_old.cfm
diff --git a/dirstructure/var/www/html/admin/2/inc/verify_system_update.cfm b/dirstructure/var/www/html/admin/2/inc/verify_system_update.cfm
diff --git a/dirstructure/var/www/html/admin/2/index.cfm b/dirstructure/var/www/html/admin/2/index.cfm
diff --git a/dirstructure/var/www/html/admin/2/test.cfm b/dirstructure/var/www/html/admin/2/test.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_ad_connection.cfm b/dirstructure/var/www/html/admin/2/view_ad_connection.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_antivirus_signature_feeds.cfm b/dirstructure/var/www/html/admin/2/view_antivirus_signature_feeds.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_console_firewall.cfm b/dirstructure/var/www/html/admin/2/view_console_firewall.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_console_settings.cfm b/dirstructure/var/www/html/admin/2/view_console_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_internal_recipients.cfm b/dirstructure/var/www/html/admin/2/view_internal_recipients.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_internal_recipients_json.cfm b/dirstructure/var/www/html/admin/2/view_internal_recipients_json.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_smtp_tls_settings.cfm b/dirstructure/var/www/html/admin/2/view_smtp_tls_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_system_certificates.cfm b/dirstructure/var/www/html/admin/2/view_system_certificates.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_system_settings.cfm b/dirstructure/var/www/html/admin/2/view_system_settings.cfm
diff --git a/dirstructure/var/www/html/admin/2/view_system_updates.cfm b/dirstructure/var/www/html/admin/2/view_system_updates.cfm
diff --git a/dirstructure/var/www/html/admin/ad_integration.cfm b/dirstructure/var/www/html/admin/ad_integration.cfm
diff --git a/dirstructure/var/www/html/admin/console_ssl_settings.cfm b/dirstructure/var/www/html/admin/console_ssl_settings.cfm
diff --git a/dirstructure/var/www/html/admin/create_csr.cfm b/dirstructure/var/www/html/admin/create_csr.cfm
diff --git a/dirstructure/var/www/html/admin/dkim_configuration.cfm b/dirstructure/var/www/html/admin/dkim_configuration.cfm
diff --git a/dirstructure/var/www/html/admin/dkim_sender_bypass.cfm b/dirstructure/var/www/html/admin/dkim_sender_bypass.cfm
diff --git a/dirstructure/var/www/html/admin/dkim_sign.cfm b/dirstructure/var/www/html/admin/dkim_sign.cfm
diff --git a/dirstructure/var/www/html/admin/dkim_trusted_hosts.cfm b/dirstructure/var/www/html/admin/dkim_trusted_hosts.cfm
diff --git a/dirstructure/var/www/html/admin/dmarc_configuration.cfm b/dirstructure/var/www/html/admin/dmarc_configuration.cfm
diff --git a/dirstructure/var/www/html/admin/firewall_settings.cfm b/dirstructure/var/www/html/admin/firewall_settings.cfm
diff --git a/dirstructure/var/www/html/admin/index.cfm b/dirstructure/var/www/html/admin/index.cfm
diff --git a/dirstructure/var/www/html/admin/logout.cfm b/dirstructure/var/www/html/admin/logout.cfm
diff --git a/dirstructure/var/www/html/admin/new_serial.cfm b/dirstructure/var/www/html/admin/new_serial.cfm
diff --git a/dirstructure/var/www/html/admin/recipients.cfm b/dirstructure/var/www/html/admin/recipients.cfm
diff --git a/dirstructure/var/www/html/admin/smtp_tls_policy.cfm b/dirstructure/var/www/html/admin/smtp_tls_policy.cfm
diff --git a/dirstructure/var/www/html/admin/smtp_tls_settings.cfm b/dirstructure/var/www/html/admin/smtp_tls_settings.cfm
diff --git a/dirstructure/var/www/html/admin/spf_bypass.cfm b/dirstructure/var/www/html/admin/spf_bypass.cfm
diff --git a/dirstructure/var/www/html/admin/spf_configuration.cfm b/dirstructure/var/www/html/admin/spf_configuration.cfm
diff --git a/dirstructure/var/www/html/admin/system_settings.cfm b/dirstructure/var/www/html/admin/system_settings.cfm
diff --git a/dirstructure/var/www/html/admin/system_update.cfm b/dirstructure/var/www/html/admin/system_update.cfm
diff --git a/dirstructure/var/www/html/admin/test.cfm b/dirstructure/var/www/html/admin/test.cfm
diff --git a/dirstructure/var/www/html/admin/test2.cfm b/dirstructure/var/www/html/admin/test2.cfm
@@ -1,286 +1,35 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>test2</title>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="Generator" content="NetObjects (http://netobjects.com)">
-<link rel="stylesheet" type="text/css" href="./fusion.css">
-<link rel="stylesheet" type="text/css" href="./style.css">
-<link rel="stylesheet" type="text/css" href="./site.css">
-</head>
-<body style="margin: 0px;">
-  <table border="0" cellspacing="0" cellpadding="0" width="531">
-    <tr valign="top" align="left">
-      <td width="50" height="41"></td>
-      <td width="481"></td>
-    </tr>
-    <tr valign="top" align="left">
-      <td></td>
-      <td width="481" id="Text442" class="TextObject"><cfset date = "2018-11-11">
-<cfset theDate = REReplaceNoCase(date,"-","","all")>
-
-<cfoutput>The Date: #theDate#<br></cfoutput>
-
-<cfquery name="year1" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 10
-</cfquery>
-
-<cfquery name="insert_year1" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="year1">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getyear1" datasource="#datasource#">
-select salt as year1 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset year1_salt=#getyear1.year1#>
-
-<cfoutput>Year1 Salt: #year1_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="year2" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 3
-</cfquery>
-
-<cfquery name="insert_year2" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="year2">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getyear2" datasource="#datasource#">
-select salt as year2 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset year2_salt=#getyear2.year2#>
-
-<cfoutput>Year2 Salt: #year2_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="year3" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 1
-</cfquery>
-
-<cfquery name="insert_year3" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="year3">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getyear3" datasource="#datasource#">
-select salt as year3 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset year3_salt=#getyear3.year3#>
-
-<cfoutput>Year3 Salt: #year3_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="year4" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 4
-</cfquery>
-
-<cfquery name="insert_year4" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="year4">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getyear4" datasource="#datasource#">
-select salt as year4 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset year4_salt=#getyear4.year4#>
-
-<cfoutput>Year4 Salt: #year4_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="month1" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 2
-</cfquery>
-
-<cfquery name="insert_month1" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="month1">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getmonth1" datasource="#datasource#">
-select salt as month1 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset month1_salt=#getmonth1.month1#>
-
-<cfoutput>Month1 Salt: #month1_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="month2" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 2
-</cfquery>
-
-<cfquery name="insert_month2" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="month2">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getmonth2" datasource="#datasource#">
-select salt as month2 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset month2_salt=#getmonth2.month2#>
-
-<cfoutput>Month2 Salt: #month2_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="day1" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 6
-</cfquery>
-
-<cfquery name="insert_day1" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="day1">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getday1" datasource="#datasource#">
-select salt as day1 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset day1_salt=#getday1.day1#>
-
-<cfoutput>Day1 Salt: #day1_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="day2" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 3
-</cfquery>
-
-<cfquery name="insert_day2" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="day2">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getday2" datasource="#datasource#">
-select salt as day2 from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset day2_salt=#getday2.day2#>
-
-<cfoutput>Day2 Salt: #day2_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfquery name="last" datasource="#datasource#" result="getrandom_results">
-select random_letter as random from captcha_list_all3 order by RAND() limit 1
-</cfquery>
-
-<cfquery name="insert_last" datasource="#datasource#" result="stResult512">
-insert into salt
-(salt)
-values
-('<cfoutput query="last">#TRIM(random)#</cfoutput>')
-</cfquery>
-
-<cfquery name="getlast" datasource="#datasource#">
-select salt as last from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-<cfset last_salt=#getlast.last#>
-
-<cfoutput>Last Salt: #last_salt#</cfoutput><br>
-
-<cfquery name="deletesalt" datasource="#datasource#">
-delete from salt where id='#stResult512.GENERATED_KEY#'
-</cfquery>
-
-
-<cfset year1="#mid(theDate, 1, 1)#">
-<cfset year2="#mid(theDate, 2, 1)#">
-<cfset year3="#mid(theDate, 3, 1)#">
-<cfset year4="#mid(theDate, 4, 1)#">
-<cfset month1="#mid(theDate, 5, 1)#">
-<cfset month2="#mid(theDate, 6, 1)#">
-<cfset day1="#mid(theDate, 7, 1)#">
-<cfset day2="#mid(theDate, 8, 1)#">
-
-
-
-<cfoutput>The Date Again: <br>#year1#<br>#year2#<br>#year3#<br>#year4#<br>#month1#<br>#month2#<br>#day1#<br>#day2#<br></cfoutput>
-
-<cfset theResponse="#LCase(year1_salt)##year1##LCase(year2_salt)##year2##LCase(year3_salt)##year3##LCase(year4_salt)##year4##LCase(month1_salt)##month1##LCase(month2_salt)##month2##LCase(day1_salt)##day1##LCase(day2_salt)##day2##LCase(last_salt)#-e2a8aca48c5b24df14c6e0ab0b30df7ed50fa97bc22fd706c71a7eebe96a8b67">
-
-<cfoutput>The Response: #theResponse#</cfoutput><br>
-
-<cfset right64=#Right(theResponse,64)#>
-<cfset left40=#Left(theResponse,40)#>
-
-<cfoutput>Right 64: #right64#</cfoutput><br>
-
-<cfoutput>Left 40: #left40#</cfoutput><br>
-
-<cfset response="SUCCESS">
-
-<cfexecute name = "/opt/hermes/scripts/dmidecode"
-arguments=""
-timeout = "60">
-</cfexecute>
-
-<cffile action="read" file="/usr/share/UUID" variable="temp1">
-
-<cfset temp2="#REReplace("#temp1#","#chr(10)#","","ALL")#">
-
-<cfset temp3="#REReplace("#temp2#","#chr(13)#","","ALL")#">
-<cfset temp4="#REReplace("#temp3#","","","ALL")#">
-<cfset temp5="#REReplace("#temp4#","UUID:","","ALL")#">
-
-<cfset temp5 = #trim(temp5)#>
-
-
-<cfoutput> String to Hash: #temp5##response#</cfoutput><br>
-
-<cfset theHash=Hash(temp5 & response, 'SHA-256', 'UTF-8')>
-
-<cfoutput>The Hash: #theHash#</cfoutput>
-        <p style="margin-bottom: 0px;">&nbsp;</p>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
- 
+<cfquery name="getrandom_512" datasource="hermes" result="getrandom_results">
+  select random_letter as random_512 from captcha_list order by RAND() limit 30
+  </cfquery>
+
+  <cfquery name="insert_salt_512" datasource="hermes" result="stResult512">
+  insert into salt
+  (salt)
+  values
+  ('<cfoutput query="getrandom_512">#TRIM(random_512)#</cfoutput>')
+  </cfquery>
+
+  <cfquery name="getsalt_512" datasource="hermes">
+  select salt as salt_512 from salt where id='#stResult512.GENERATED_KEY#'
+  </cfquery>
+
+  <cfset salt512=#getsalt_512.salt_512#>
+
+  <cfquery name="deletesalt512" datasource="hermes">
+  delete from salt where id='#stResult512.GENERATED_KEY#'
+  </cfquery>
+
+
+<cfset saltHash512=Hash(salt512, 'SHA-512', 'UTF-8') />
+
+<cfset passwordHash512=Hash("password" & saltHash512, 'SHA-512', 'UTF-8') />
+
+<cfset passwordandsalt = #lcase(passwordHash512 & saltHash512)#>
+
+<cfset passwordandsalt = "{SSHA512.hex}#passwordandsalt#">
+
+<cfoutput>
+Salt: #lcase(saltHash512)#<br>
+Password: #lcase(passwordHash512)#<br>
+saltandpassword: #passwordandsalt#
+</cfoutput>
diff --git a/hermes_migrate_1804_2004.sh b/hermes_migrate_1804_2004.sh
@@ -132,6 +132,28 @@ apt-get install netplan.io -y >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1
 
 stop_spinner $?
 
+start_spinner 'Installing Snap (If Necessary. This may fail if already installed)...'
+sleep 1
+
+##TRY SNAP INSTALL IN CASE IT'S MISSING FROM UBUNTU 18.04 TO UBUNTU 20.04 UPGRADE
+apt-get install snapd -y >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1
+
+stop_spinner $?
+
+start_spinner 'Outputting Certbot System Timers (Ensure snap.certbot.renew.service and snap.certbot.renew.timer are present)...'
+sleep 1
+
+ls -l  /etc/systemd/system/ | grep certbot | boxes -d stone -p a2v1
+
+stop_spinner $?
+
+start_spinner 'Outputting Certbot Renew Timer (Ensure loaded active waiting appears below)...'
+sleep 1
+
+systemctl list-units | grep certbot.renew | boxes -d stone -p a2v1
+
+stop_spinner $?
+
 start_spinner 'Updating Hermes SEG Version...'
 sleep 1