Skip to content
Snippets Groups Projects
Commit 3de87cb7 authored by Marco Malavolti's avatar Marco Malavolti
Browse files

Refactorized and removed Logger for ECCS2 output

parent 5dacd1f9
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
README.md
+ 21
− 0
View file @ 3de87cb7
......@@ -46,4 +46,25 @@
* 'Excluded'
* /eccs/eccsresults (Return the results of the last check ready for ECCS Gui)
# APACHE CONFIGURATION
* `sudo vim /etc/apache2/sites-availabled/eccs2.conf
```apache
<IfModule mod_alias.c>
Alias /eccs2 /opt/eccs2/web
Alias /eccs2html /opt/eccs2/html
<Directory /opt/eccs2/web>
DirectoryIndex index.php
Require all granted
</Directory>
<Directory /opt/eccs2/html>
Require all granted
</Directory>
</IfModule>
```
* `sudo a2ensite eccs2.conf`
* `sudo systemctl reload apache2.service`
cleanAndRunEccs2.sh
+ 3
− 0
View file @ 3de87cb7
......@@ -5,3 +5,6 @@ rm -f /opt/eccs2/input/*.json
# Run ECCS2
/opt/eccs2/runEccs2.py
# Run Failed Command again
bash /opt/eccs2/logs/failed-cmd.sh
eccs2.py
+ 36
− 66
View file @ 3de87cb7
......@@ -7,7 +7,7 @@ import re
import requests
import time
from eccs2properties import DAY, ECCS2HTMLDIR, ECCS2LOGSDIR, ECCS2OUTPUTDIR, ECCS2RESULTSLOG, ECCS2CHECKSLOG, FEDS_BLACKLIST, IDPS_BLACKLIST, ECCS2SPS, ECCS2SELENIUMDEBUG
from eccs2properties import DAY, ECCS2HTMLDIR, ECCS2OUTPUTDIR, ECCS2RESULTSLOG, ECCS2CHECKSLOG, FEDS_BLACKLIST, IDPS_BLACKLIST, ECCS2SPS, ECCS2SELENIUMDEBUG
from pathlib import Path
from selenium.webdriver.common.by import By
from selenium.webdriver.common.keys import Keys
......@@ -45,12 +45,10 @@ def checkIdP(sp,idp):
if (idp['registrationAuthority'] in federation_blacklist):
check_time = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S') + 'Z'
#logger.info("%s;%s;%s;NULL;Federation excluded from checks" % (idp['entityID'],sp,check_time))
return (idp['entityID'],sp,check_time,"NULL","DISABLED")
if (idp['entityID'] in entities_blacklist):
check_time = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S') + 'Z'
#logger.info("%s;%s;%s;NULL;IdP excluded from checks" % (idp['entityID'],sp,check_time))
return (idp['entityID'],sp,check_time,"NULL","DISABLED")
# Open SP, select the IDP from the EDS and press 'Enter' to reach the IdP login page to check
......@@ -70,7 +68,6 @@ def checkIdP(sp,idp):
html.write(page_source)
except TimeoutException as e:
#logger.info("%s;%s;999;%s;Timeout" % (idp['entityID'],sp,check_time))
return (idp['entityID'],sp,check_time,"999","Timeout")
except NoSuchElementException as e:
......@@ -82,7 +79,6 @@ def checkIdP(sp,idp):
return None
except UnexpectedAlertPresentException as e:
#logger.info("%s;%s;888;%s;UnexpectedAlertPresent" % (idp['entityID'],sp,check_time))
return (idp['entityID'],sp,check_time,"888","ERROR")
except WebDriverException as e:
......@@ -100,7 +96,6 @@ def checkIdP(sp,idp):
finally:
driver.quit()
pattern_metadata = "Unable.to.locate(\sissuer.in|).metadata(\sfor|)|no.metadata.found|profile.is.not.configured.for.relying.party|Cannot.locate.entity|fail.to.load.unknown.provider|does.not.recognise.the.service|unable.to.load.provider|Nous.n'avons.pas.pu.(charg|charger).le.fournisseur.de service|Metadata.not.found|application.you.have.accessed.is.not.registered.for.use.with.this.service|Message.did.not.meet.security.requirements"
pattern_username = '<input[\s]+[^>]*((type=\s*[\'"](text|email)[\'"]|user)|(name=\s*[\'"](name)[\'"]))[^>]*>';
......@@ -144,49 +139,32 @@ def checkIdP(sp,idp):
print ("IdP: %s\nSP: %s" % (idp['entityID'],sp))
status_code = "555"
if(metadata_not_found):
#logger.info("%s;%s;%s;%s;No-eduGAIN-Metadata" % (idp['entityID'],sp,status_code,check_time))
return (idp['entityID'],sp,check_time,status_code,"No-eduGAIN-Metadata")
elif not username_found or not password_found:
#logger.info("%s;%s;%s;%s;Invalid-Form" % (idp['entityID'],sp,status_code,check_time))
return (idp['entityID'],sp,check_time,status_code,"Invalid-Form")
else:
#logger.info("%s;%s;%s;%s;OK" % (idp['entityID'],sp,status_code,check_time))
return (idp['entityID'],sp,check_time,status_code,"OK")
def check(idp,sps,eccs2log):
results = []
for sp in sps:
resultCheck = checkIdP(sp,idp)
# Se il checkIdP ha successo, aggiungo alla lista dei check
# altrimenti no.
if resultCheck is not None:
results.append(resultCheck)
if len(results) == 2:
with open("%s/%s" % (ECCS2OUTPUTDIR,ECCS2CHECKSLOG), 'a') as f:
for elem in results:
f.write(";".join(elem))
f.write("\n")
def storeECCS2result(idp,results,idp_status):
# Build the contacts lists: technical/support
listTechContacts = getIdPContacts(idp,'technical')
listSuppContacts = getIdPContacts(idp,'support')
strTechContacts = ','.join(listTechContacts)
strSuppContacts = ','.join(listSuppContacts)
# If all checks are 'OK', than the IdP consuming correctly eduGAIN Metadata.
if (results[0][4] == results[1][4] == "OK"):
# IdP-DisplayName;IdP-entityID;IdP-RegAuth;IdP-tech-ctc-1,IdP-tech-ctc-2;IdP-supp-ctc-1,IdP-supp-ctc-2;Status;SP-entityID-1;SP-check-time-1;SP-status-code-1;SP-result-1;SP-entityID-2;SP-check-time-2;SP-status-code-2;SP-result-2
eccs2log.info("%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s" % (
idp['displayname'].replace("&apos;","'").split(';')[1].split('==')[0],
idp['entityID'],
idp['registrationAuthority'],
strTechContacts,
strSuppContacts,
'OK',
with open("%s/%s" % (ECCS2OUTPUTDIR,ECCS2RESULTSLOG), 'a') as f:
f.write("%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s\n" % (
idp['displayname'].replace("&apos;","'").split(';')[1].split('==')[0], # IdP-DisplayName
idp['entityID'], # IdP-entityID
idp['registrationAuthority'], # IdP-RegAuth
strTechContacts, # IdP-TechCtcsList
strSuppContacts, # IdP-SuppCtcsList
idp_status, # IdP-ECCS-Status
results[0][1], # SP-entityID-1
results[0][2], # SP-check-time-1
results[0][3], # SP-status-code-1
......@@ -195,45 +173,37 @@ def check(idp,sps,eccs2log):
results[1][2], # SP-check-time-2
results[1][3], # SP-status-code-2
results[1][4])) # SP-result-2
def check(idp,sps):
results = []
for sp in sps:
resultCheck = checkIdP(sp,idp)
# Se il checkIdP ha successo, aggiungo alla lista dei check
# altrimenti no.
if resultCheck is not None:
results.append(resultCheck)
if len(results) == 2:
with open("%s/%s" % (ECCS2OUTPUTDIR,ECCS2CHECKSLOG), 'a') as f:
for elem in results:
f.write(";".join(elem))
f.write("\n")
# If all checks are 'OK', than the IdP consuming correctly eduGAIN Metadata.
if (results[0][4] == results[1][4] == "OK"):
storeECCS2result(idp,results,'OK')
elif (results[0][4] == results[1][4] == "DISABLED"):
eccs2log.info("%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s" % (
idp['displayname'].replace("&apos;","'").split(';')[1].split('==')[0],
idp['entityID'],
idp['registrationAuthority'],
strTechContacts,
strSuppContacts,
'DISABLE',
results[0][1],
results[0][2],
results[0][3],
results[0][4],
results[1][1],
results[1][2],
results[1][3],
results[1][4]))
storeECCS2result(idp,results,'DISABLED')
else:
eccs2log.info("%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s" % (
idp['displayname'].replace("&apos;","'").split(';')[1].split('==')[0],
idp['entityID'],
idp['registrationAuthority'],
strTechContacts,
strSuppContacts,
'ERROR',
results[0][1],
results[0][2],
results[0][3],
results[0][4],
results[1][1],
results[1][2],
results[1][3],
results[1][4]))
storeECCS2result(idp,results,'ERROR')
# MAIN
if __name__=="__main__":
eccs2log = getLogger(ECCS2RESULTSLOG, ECCS2OUTPUTDIR, 'a', "INFO")
sps = ECCS2SPS
parser = argparse.ArgumentParser(description='Checks if the input IdP consumed correctly eduGAIN metadata by accessing two different SPs')
......@@ -243,4 +213,4 @@ if __name__=="__main__":
idp = json.loads(args.idpJson[0])
check(idp,sps,eccs2log)
check(idp,sps)
eccs2properties.py
+ 2
− 2
View file @ 3de87cb7
......@@ -18,7 +18,6 @@ ECCS2OUTPUTDIR = "%s/output" % ECCS2DIR
ECCS2RESULTSLOG = "eccs2_%s.log" % DAY
ECCS2CHECKSLOG = "eccs2checks_%s.log" % DAY
ECCS2HTMLDIR = "%s/html" % ECCS2DIR
ECCS2FAILEDCMD = "%s/failed-cmd.sh" % ECCS2LOGSDIR
# Selenium
ECCS2SELENIUMDEBUG = False
......@@ -30,9 +29,10 @@ ECCS2SELENIUMSCRIPTTIMEOUT = 30 #seconds
ECCS2LOGSDIR = "%s/logs" % ECCS2DIR
ECCS2STDOUT = "%s/stdout_%s.log" % (ECCS2LOGSDIR,DAY)
ECCS2STDERR = "%s/stderr_%s.log" % (ECCS2LOGSDIR,DAY)
ECCS2FAILEDCMD = "%s/failed-cmd.sh" % ECCS2LOGSDIR
# Number of processes to run in parallel
ECCS2NUMPROCESSES = 30
ECCS2NUMPROCESSES = 20
# The 2 SPs that will be used to test each IdP
ECCS2SPS = ["https://sp24-test.garr.it/secure", "https://attribute-viewer.aai.switch.ch/eds/"]
......
......
runEccs2.py
+ 1
− 1
View file @ 3de87cb7
......@@ -30,7 +30,7 @@ async def run(name,queue,stdout_file,stderr_file,cmd_file):
stdout_file.write('-----\n[cmd-out]\n%s\n\n[stdout]\n%s' % (cmd,stdout.decode()))
if stderr:
stderr_file.write('-----\n[cmd-err]\n%s\n\n[stderr]\n%s' % (cmd,stderr.decode()))
cmd_file.write(cmd)
cmd_file.write(cmd + '\n')
# Notify the queue that the "work cmd" has been processed.
queue.task_done()
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment