Read encrypted vars in install() so it won't break session_setup()

master
Daniel Berteaud 5 years ago
parent c357d4adc5
commit 90b9021658
  1. 8
      WAPT/control
  2. 3
      setup.py

@ -1,5 +1,5 @@
package : fws-chrome package : fws-chrome
version : 78.0.3904.108-6 version : 78.0.3904.108-8
architecture : all architecture : all
section : base section : base
priority : optional priority : optional
@ -27,12 +27,12 @@ editor : Google
keywords : browser,navigateur,Google,Chrome,Chromium keywords : browser,navigateur,Google,Chrome,Chromium
licence : Freeware licence : Freeware
homepage : https://www.google.com/chrome/ homepage : https://www.google.com/chrome/
package_uuid : a154eb6c-cd7d-4e19-9d75-43596d8595a7 package_uuid : d4efb932-9b4f-4b61-bea8-0ad5f205a80a
valid_from : valid_from :
valid_until : valid_until :
forced_install_on : forced_install_on :
signer : Daniel Berteaud signer : Daniel Berteaud
signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
signature : tZph2uBpBxXMgtr7lxh6/Qa5U3UEaeK67CS7NAwx0/hmI9hlSmtWTPYrhOUAa6rDjTOwY1hR76ojdLlYLRK4W7yzZG0ej6QxammWEh3qzh47mHADMwXiVxzktvYfrBj/mVRjdX/G5Z0hPHqCyAlMraXZkVa9HnWqY/FNswkOyYmayEW5HTJg+K9JE8yEGnd5VAnzKqrBIXo2aTcwCDcctiNqrTEOhcrNBZfA0gcC/yHwbKkmeP3Z1zLdMOUyIazsxZ5qqfeHRzVHXAG9u1wPFaQjNJt70eMUdXZ4UlmVWTMzBNlcMJnDo65LjL+LkRiunTYVKNSUSKzG8WyS3wygmg== signature : VGjpn2sqS4XO5yzhVh+19JHCKdIj6TWmIG8r1cWwNdIhT578OlLV408h3h4cXsFY/07wZFnteugdZiKp6UeUGpx0wS8faZpEGrboz3dW6zcNz0zMiTNQ8Zz+cLucJyyY4OQU2DPn8QbwPlDThc7n3BXp9d5OvsbiGKEGs28Hf7G0W2eFwKmda6HymIHpde1EHlZbNgl+0PGlHp5++H2NCsuaTYT94wzBFThqeJBOU13vUE0w/QHNfsIWKyQJSPwBI4xPmKNa9YusS6OMvunMxbHs0JQ0M+QuR4sC6yOXne6YLJZyC9jAyYmpibjRJvXisDP53kcerCIILuxdiKYn4g==
signature_date : 2019-11-21T11:12:26.124000 signature_date : 2019-12-10T18:24:50.659000
signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes

@ -13,6 +13,8 @@ chrome_app_path=makepath(programfiles32,'Google','Chrome','Application')
chrome_bin_path=makepath(chrome_app_path,'chrome.exe') chrome_bin_path=makepath(chrome_app_path,'chrome.exe')
bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi' bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi'
def install():
# Read local variables file if available # Read local variables file if available
if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')): if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
print('Reading local encrypted variables file') print('Reading local encrypted variables file')
@ -21,7 +23,6 @@ if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(m
f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read()) f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read()))) variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
def install():
print('Installing %s' % control.asrequirement()) print('Installing %s' % control.asrequirement())
# Specific app values # Specific app values

Loading…
Cancel
Save