diff --git a/README.md b/README.md
index 7add029f160ab225870af61642cecf696f6cbf8c..9d95d186b5048159549f3821a114f05602430812 100644
--- a/README.md
+++ b/README.md
@@ -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`
diff --git a/cleanAndRunEccs2.sh b/cleanAndRunEccs2.sh
index 8c7dba6b748dd08aca41f3c2af922cb366a295c1..0148ae5a52d8df5c8935a3b68bc23b53d2e67302 100755
--- a/cleanAndRunEccs2.sh
+++ b/cleanAndRunEccs2.sh
@@ -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
diff --git a/eccs2.py b/eccs2.py
index 40908c68e5ea8d8ffce0d30d52e182b145b0279f..9e20c24942c3b045de5dc78e2b4ee7d02b3c22d4 100755
--- a/eccs2.py
+++ b/eccs2.py
@@ -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,19 +139,43 @@ 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):
+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)
+
+ # 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
+ 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("'","'").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
+ results[0][4], # SP-result-1
+ results[1][1], # SP-entityID-2
+ 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)
@@ -171,69 +190,20 @@ def check(idp,sps,eccs2log):
f.write(";".join(elem))
f.write("\n")
- 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("'","'").split(';')[1].split('==')[0],
- idp['entityID'],
- idp['registrationAuthority'],
- strTechContacts,
- strSuppContacts,
- 'OK',
- results[0][1], # SP-entityID-1
- results[0][2], # SP-check-time-1
- results[0][3], # SP-status-code-1
- results[0][4], # SP-result-1
- results[1][1], # SP-entityID-2
- results[1][2], # SP-check-time-2
- results[1][3], # SP-status-code-2
- results[1][4])) # SP-result-2
+ 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("'","'").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("'","'").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)
diff --git a/eccs2properties.py b/eccs2properties.py
index a76852b7d17bb0f915142baec3855217557560d4..416cb8cdc0eb5b248455a27e79292f7a94607bb8 100644
--- a/eccs2properties.py
+++ b/eccs2properties.py
@@ -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/"]
diff --git a/runEccs2.py b/runEccs2.py
index 478548228bcc5cf98c888e427fd4ceb0464eacc6..19cb9e5ff9ec4ecc9ef83ffa22dcbd4120127a35 100755
--- a/runEccs2.py
+++ b/runEccs2.py
@@ -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()