Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new CERN IAM LSC files (SOFTWARE-5843) #134

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Add new CERN IAM LSC files (SOFTWARE-5843) #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deff692
Add LSC files for new IAM hosts (SOFTWARE-5843)
matyasselmeci Mar 14, 2024
0839dc5
Modify vomses-crosscheck to ignore new CERN-IAM LSC files for now
matyasselmeci Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions bin/vomses-crosscheck
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ import sys
vomses_path = "vomses"
vomsdir = "vomsdir"


# A list of .lsc files that are not meant to be in the vomses file (SOFTWARE-5843)
lsc_ignore_missing_vomses = [
"alice/voms-alice-auth.cern.ch.lsc",
"atlas/voms-atlas-auth.cern.ch.lsc",
"cms/voms-cms-auth.cern.ch.lsc",
"dteam/voms-dteam-auth.cern.ch.lsc",
"lhcb/voms-lhcb-auth.cern.ch.lsc",
]


def usage():
print("usage: %s [vomses vomsdir]" % os.path.basename(__file__))
print(" or: %s --system" % os.path.basename(__file__))
Expand Down Expand Up @@ -60,6 +71,7 @@ vomses_entries = get_vomses()
missing_lsc_files = []
missing_vomses_entries = []
dn_mismatches = []
wrongly_ignored_lsc = []

for entry in vomses_entries:
lsc = get_lsc(entry)
Expand All @@ -76,15 +88,24 @@ vomses_lsc_files = set(entry.lsc for entry in vomses_entries)

os.chdir(vomsdir)
for lsc_path in sorted(glob.glob("*/*.lsc")):
if lsc_path not in vomses_lsc_files:
missing_vomses_entries += ["No vomses entry for %s" % lsc_path]
if lsc_path in lsc_ignore_missing_vomses:
if lsc_path in vomses_lsc_files:
wrongly_ignored_lsc += [
"vomses entry found for ignored lsc file %s; please remove from "
"lsc_ignore_missing_vomses"
]
else:
if lsc_path not in vomses_lsc_files:
missing_vomses_entries += ["No vomses entry for %s" % lsc_path]

for x in (missing_lsc_files, missing_vomses_entries, dn_mismatches):
for x in (missing_lsc_files, missing_vomses_entries, dn_mismatches,
wrongly_ignored_lsc):
if x:
for line in x:
print(line)
print()

e = bool(missing_lsc_files or missing_vomses_entries or dn_mismatches)
e = bool(missing_lsc_files or missing_vomses_entries or dn_mismatches or
wrongly_ignored_lsc)
sys.exit(e)

2 changes: 2 additions & 0 deletions vomsdir/alice/voms-alice-auth.cern.ch.lsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/DC=ch/DC=cern/OU=computers/CN=alice-auth.cern.ch
/DC=ch/DC=cern/CN=CERN Grid Certification Authority
2 changes: 2 additions & 0 deletions vomsdir/atlas/voms-atlas-auth.cern.ch.lsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/DC=ch/DC=cern/OU=computers/CN=atlas-auth.cern.ch
/DC=ch/DC=cern/CN=CERN Grid Certification Authority
2 changes: 2 additions & 0 deletions vomsdir/cms/voms-cms-auth.cern.ch.lsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/DC=ch/DC=cern/OU=computers/CN=cms-auth.cern.ch
/DC=ch/DC=cern/CN=CERN Grid Certification Authority
2 changes: 2 additions & 0 deletions vomsdir/dteam/voms-dteam-auth.cern.ch.lsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/DC=ch/DC=cern/OU=computers/CN=dteam-auth.cern.ch
/DC=ch/DC=cern/CN=CERN Grid Certification Authority
2 changes: 2 additions & 0 deletions vomsdir/lhcb/voms-lhcb-auth.cern.ch.lsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/DC=ch/DC=cern/OU=computers/CN=lhcb-auth.cern.ch
/DC=ch/DC=cern/CN=CERN Grid Certification Authority
Loading