From 3af513440e0a9ad44cac7a93b91e8485f6a195c8 Mon Sep 17 00:00:00 2001 From: Aaron Helsinger Date: Thu, 10 Dec 2015 10:17:04 -0500 Subject: [PATCH 1/4] update the agg_nick_cache to include AMs added after the last release, and to say the canonical location is in git on github --- agg_nick_cache.base | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/agg_nick_cache.base b/agg_nick_cache.base index 6a5ddcfa..8bb2d94b 100644 --- a/agg_nick_cache.base +++ b/agg_nick_cache.base @@ -1,6 +1,7 @@ ### DO NOT MODIFY THIS FILE BY HAND ### -# This file lives at: http://trac.gpolab.bbn.com/gcf/raw-attachment/wiki/Omni/agg_nick_cache -# Last updated on May 19, 2015 +# This file lives at: https://raw.githubusercontent.com/GENI-NSF/geni-tools/master/agg_nick_cache.base +# - the master branch of the geni-tools Github repository +# Last updated on December 9, 2015 [omni_defaults] # This section is for updating Omni defaults without updating Omni. @@ -26,7 +27,7 @@ scs_url=https://geni-scs.net.internet2.edu:8443/geni/xmlrpc # Specify the latest version of Omni released, and a message # Expected format is "#,Message" EG: "2.8,Omni 2.8 was release 2/1/2015". No commas in the message. # If a newer version is available, Omni will log a message at INFO level. -latest_omni_version=2.8.1,Omni 2.8.1 was released 5/1/2015. See http://trac.gpolab.bbn.com/gcf +latest_omni_version=2.9,Omni 2.9 was released 5/27/2015. See https://github.com/GENI-NSF/geni-tools/wiki #------AM nicknames # Format : @@ -594,6 +595,10 @@ wall2=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilab wall2-1=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/1.0 wall2-2=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 wall2-3=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/3.0 +im-vw2=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-vw2-1=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/1.0 +im-vw2-2=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-vw2-3=urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/3.0 # ==== # NICTA ExoGENI @@ -687,3 +692,32 @@ utah-stitch1=urn:publicid:IDN+stitch.geniracks.net+authority+cm,https://boss.sti utah-stitch2=urn:publicid:IDN+stitch.geniracks.net+authority+cm,https://boss.stitch.geniracks.net:12369/protogeni/xmlrpc/am/2.0 utah-stitch3=urn:publicid:IDN+stitch.geniracks.net+authority+cm,https://boss.stitch.geniracks.net:12369/protogeni/xmlrpc/am/3.0 +# ==== +# iMinds Virtual Wall 1 +# ==== +wall1=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +wall1-1=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/1.0 +wall1-2=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +wall1-3=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/3.0 +im-vw1=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-vw1-1=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/1.0 +im-vw1-2=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-vw1-3=urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm,https://www.wall1.ilabt.iminds.be:12369/protogeni/xmlrpc/am/3.0 + +# ==== +# iMinds iLab.t Wireless lab +# ==== +im-wilab=urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm,https://www.wilab2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-wilab1=urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm,https://www.wilab2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/1.0 +im-wilab2=urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm,https://www.wilab2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0 +im-wilab3=urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm,https://www.wilab2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/3.0 + +# ====== +# Kaiserslautern (UKL) OpenGENI +# ====== +ukl-og=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 +ukl-og2=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 +ukl-og3=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5001 +kaiserslautern-og=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 +kaiserslautern-og2=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 +kaiserslautern-og3=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5001 From b07fe7d43b9975964f77ca3c652ee6399c5ab2b4 Mon Sep 17 00:00:00 2001 From: Aaron Helsinger Date: Wed, 16 Dec 2015 12:16:04 -0500 Subject: [PATCH 2/4] update cache to list latest release and release date --- agg_nick_cache.base | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agg_nick_cache.base b/agg_nick_cache.base index 8bb2d94b..df99e67b 100644 --- a/agg_nick_cache.base +++ b/agg_nick_cache.base @@ -1,7 +1,7 @@ ### DO NOT MODIFY THIS FILE BY HAND ### # This file lives at: https://raw.githubusercontent.com/GENI-NSF/geni-tools/master/agg_nick_cache.base # - the master branch of the geni-tools Github repository -# Last updated on December 9, 2015 +# Last updated on December 16, 2015 [omni_defaults] # This section is for updating Omni defaults without updating Omni. @@ -27,7 +27,7 @@ scs_url=https://geni-scs.net.internet2.edu:8443/geni/xmlrpc # Specify the latest version of Omni released, and a message # Expected format is "#,Message" EG: "2.8,Omni 2.8 was release 2/1/2015". No commas in the message. # If a newer version is available, Omni will log a message at INFO level. -latest_omni_version=2.9,Omni 2.9 was released 5/27/2015. See https://github.com/GENI-NSF/geni-tools/wiki +latest_omni_version=2.10,Omni 2.10 was released 12/16/2015. See https://github.com/GENI-NSF/geni-tools/wiki #------AM nicknames # Format : From 07b46c43d2bc3d7a3e3c4f2cdc0beb86a3e614f4 Mon Sep 17 00:00:00 2001 From: Aaron Helsinger Date: Tue, 2 Feb 2016 08:46:59 -0500 Subject: [PATCH 3/4] Issue #890: Do not use strip to remove a prefix. Fix matching signature refid to the credential being signed in SFA credentials. --- CHANGES | 1 + src/gcf/sfa/trust/credential.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 229b114c..570eb46d 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ gcf 2.11: * Remove bogus check for rspec tag (#885) + * Properly remove prefix from signature refid in SFA credentials. (#890) gcf 2.10: * Changed references to trac.gpolab.bbn.com to point to Github. diff --git a/src/gcf/sfa/trust/credential.py b/src/gcf/sfa/trust/credential.py index 31ebf366..5fb4604e 100644 --- a/src/gcf/sfa/trust/credential.py +++ b/src/gcf/sfa/trust/credential.py @@ -183,20 +183,26 @@ def set_issuer_gid(self, gid): self.gid = gid def decode(self): + # Helper function to pull characters off the front of a string if present + def remove_prefix(text, prefix): + if text and prefix and text.startswith(prefix): + return text[len(prefix):] + return text + try: doc = parseString(self.xml) except ExpatError,e: logger.log_exc ("Failed to parse credential, %s"%self.xml) raise sig = doc.getElementsByTagName("Signature")[0] - ref_id = sig.getAttribute("xml:id").strip().strip("Sig_") + ref_id = remove_prefix(sig.getAttribute("xml:id").strip(), "Sig_") # The xml:id tag is optional, and could be in a # Reference xml:id or Reference UID sub element instead if not ref_id or ref_id == '': reference = sig.getElementsByTagName('Reference')[0] - ref_id = reference.getAttribute('xml:id').strip().strip('Sig_') + ref_id = remove_prefix(reference.getAttribute('xml:id').strip(), 'Sig_') if not ref_id or ref_id == '': - ref_id = reference.getAttribute('URI').strip().strip('#') + ref_id = remove_prefix(reference.getAttribute('URI').strip(), '#') self.set_refid(ref_id) keyinfos = sig.getElementsByTagName("X509Data") gids = None From 263c870a6bc0de1a7033df19a34c72d203d07af6 Mon Sep 17 00:00:00 2001 From: Tom Mitchell Date: Tue, 16 Feb 2016 14:59:37 -0500 Subject: [PATCH 4/4] Add umich-ig and ukymcv-ig sites --- agg_nick_cache.base | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/agg_nick_cache.base b/agg_nick_cache.base index df99e67b..c536c7fb 100644 --- a/agg_nick_cache.base +++ b/agg_nick_cache.base @@ -721,3 +721,25 @@ ukl-og3=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://g kaiserslautern-og=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 kaiserslautern-og2=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5002 kaiserslautern-og3=urn:publicid:IDN+glab077.e4.ukl.german-lab.de:gcf+authority+am,https://glab077.e4.ukl.german-lab.de:5001 + +# ===== +# University of Michigan InstaGENI +# ===== +umich-ig=urn:publicid:IDN+instageni.research.umich.edu+authority+cm,https://instageni.research.umich.edu:12369/protogeni/xmlrpc/am/2.0 +umich-ig1=urn:publicid:IDN+instageni.research.umich.edu+authority+cm,https://instageni.research.umich.edu:12369/protogeni/xmlrpc/am/1.0 +umich-ig2=urn:publicid:IDN+instageni.research.umich.edu+authority+cm,https://instageni.research.umich.edu:12369/protogeni/xmlrpc/am/2.0 +umich-ig3=urn:publicid:IDN+instageni.research.umich.edu+authority+cm,https://instageni.research.umich.edu:12369/protogeni/xmlrpc/am/3.0 +umich-ig-of=urn:publicid:IDN+openflow:foam:foam.instageni.research.umich.edu+authority+am,https://foam.instageni.research.umich.edu:3626/foam/gapi/2 +umich-ig-of1=urn:publicid:IDN+openflow:foam:foam.instageni.research.umich.edu+authority+am,https://foam.instageni.research.umich.edu:3626/foam/gapi/1 +umich-ig-of2=urn:publicid:IDN+openflow:foam:foam.instageni.research.umich.edu+authority+am,https://foam.instageni.research.umich.edu:3626/foam/gapi/2 + +# ===== +# University of Kentucky MCV InstaGENI +# ===== +ukymcv-ig=urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm,https://mcv.sdn.uky.edu:12369/protogeni/xmlrpc/am/2.0 +ukymcv-ig1=urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm,https://mcv.sdn.uky.edu:12369/protogeni/xmlrpc/am/1.0 +ukymcv-ig2=urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm,https://mcv.sdn.uky.edu:12369/protogeni/xmlrpc/am/2.0 +ukymcv-ig3=urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm,https://mcv.sdn.uky.edu:12369/protogeni/xmlrpc/am/3.0 +ukymcv-ig-of=urn:publicid:IDN+openflow:foam:foam.mcv.sdn.uky.edu+authority+am,https://foam.mcv.sdn.uky.edu:3626/foam/gapi/2 +ukymcv-ig-of1=urn:publicid:IDN+openflow:foam:foam.mcv.sdn.uky.edu+authority+am,https://foam.mcv.sdn.uky.edu:3626/foam/gapi/1 +ukymcv-ig-of2=urn:publicid:IDN+openflow:foam:foam.mcv.sdn.uky.edu+authority+am,https://foam.mcv.sdn.uky.edu:3626/foam/gapi/2