diff --git a/.classpath b/.classpath deleted file mode 100644 index 7cec603d..00000000 --- a/.classpath +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/.gitignore b/.gitignore index fdb760c4..bf81465f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,18 @@ *~ .*swp +# Java heap dumps +*.hprof + # GUI metadata files .DS_Store Thumbs.db +# Eclipse files +.classpath +.project +.settings + # / /private /build.properties diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..30f89b97 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,55 @@ +# +# Continuous integration tests for the ukf-meta repository. +# + +# +# Default image for all steps is Amazon Corretto 17, which is based +# on Amazon Linux (a variety of yum-based Linux derived from RHEL 7). +# +image: "amazoncorretto:17" + +stages: + - test + +perform-test: + stage: test + script: + # + # Install the tools we need that are not provided by the base image. + # + - yum -y --quiet install ant git libxslt + + # + # Create work directories under the current one. + # + - mkdir -p work/build work/temp + + # + # Fetch full UK federation inventory. + # + # The clone is made with a depth of 1 because we don't need any history. + # + - git clone --depth=1 https://gitlab-ci-token:$CI_JOB_TOKEN@$CI_SERVER_HOST/ukf/ukf-data.git work/ukf-data + + # + # Thin UK federation inventory: retain 100 random entities. + # + - find work/ukf-data/entities -type f -name uk0\*.xml | sort -R | tail -n +101 | xargs rm + + # + # Acquire a copy of the eduGAIN aggregate. + # + - ant -Denv=ci-download flow.edugain.download + - ls -lh work/temp + + # + # Thin the eduGAIN aggregate into another file containing just 1% of the original + # entities. + # + - xsltproc -o work/temp/edugain-thin.xml utilities/thin_aggregate.xsl work/temp/edugain-download.xml + - ls -lh work/temp + + # + # Run the full generate pipeline on the thinned input data. + # + - ant -Denv=ci-thin flow.aggregates.generate diff --git a/.project b/.project deleted file mode 100644 index dc47c5fc..00000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - inc-meta - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 609e9051..00000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,9 +0,0 @@ -DELEGATES_PREFERENCE=delegateValidatorList -USER_BUILD_PREFERENCE=enabledBuildValidatorList -USER_MANUAL_PREFERENCE=enabledManualValidatorList -USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.500.v201303130500 -eclipse.preferences.version=1 -override=true -suspend=false -vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file09build.xmlT01 -vf.version=3 diff --git a/build.xml b/build.xml index cfb83032..574ff6a2 100644 --- a/build.xml +++ b/build.xml @@ -116,6 +116,12 @@ + @@ -188,6 +194,7 @@ + - + @@ -272,10 +279,10 @@ --> - + - + - Stage 4.2 Success: Signed aggregates and stats file comitted to data repository. + fs.scp.mdqcache.from.keymaster"> + Stage 4.2 Success: Signed products retrieved from keymaster. - Stage 5 Success: Master branch pushed to origin, new tag created and pushed, mdq cache sent to repo, message sent to start publication. + Stage 5 Success: Signed products committed and pushed to origin, new tag created and pushed, mdq cache sent to repo, message sent to start publication. Triggering Jenkins publication Job. - + + + + + + + + Downloading eduGAIN aggregate. + + Download to ${mda.output.edugain.download} completed. + + + + + Removing previously downloaded eduGAIN aggregate. + + + - + Generating unsigned UKfed metadata files. - - - @@ -1619,6 +1654,18 @@ Generated UK unsigned metadata. + + + - - - - @@ -1710,13 +1753,6 @@ - - - - - @@ -1726,6 +1762,7 @@ + @@ -1896,12 +1933,11 @@ - + - + - + + Generating per-entity test selection aggregate in ${mda.mdq.input} + from unsigned aggregate in ${output.dir}/${mdaggr.prod.unsigned} + + + + + + + + + + Generating per-entity metadata in ${mda.mdq.output} from test metadata in ${mda.mdq.input} @@ -2158,20 +2209,25 @@ - SCPing unsigned files and stats file from output dir to orchestrator's build dir. - - - - - - - - - - - - - + Copying unsigned files and stats file from output dir to orchestrator's build dir. + + + + + + + + + + + + + + + + + + @@ -2208,12 +2264,17 @@ - SCPing mdq cache from orchestrator's build dir to a temp directory on repo. - - - - - + Copying mdq cache from orchestrator's build dir to a temp directory on repo. + + + + + + + + + + @@ -2370,42 +2431,6 @@ - - - Pushing UK Federation JSON files to MD dist. - -> MD-NE-01 - - - - - - - -> MD-NE-02 - - - - - - - -> MD-WE-01 - - - - - - - -> MD-WE-02 - - - - - - - - - - - - - - + - + - + - + @@ -2622,16 +2645,6 @@ - - - - - - - diff --git a/charting/Months.pm b/charting/Months.pm deleted file mode 100755 index 86e605d7..00000000 --- a/charting/Months.pm +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/perl -w - -# -# Months.pm -# -use File::stat; -use Date::Manip::Date; -use Date::Manip::Delta; - -@months = ( ); - -$date = new Date::Manip::Date; -$date->parse_date('2006-12-01') && die('could not parse base date'); - -$now = new Date::Manip::Date; -$now->parse('now') && die('could not parse now'); - -$oneMonth = new Date::Manip::Delta; -$oneMonth->parse("1 month") && die('could not parse delta'); - -# -# Enumerate all month beginnings that have already happened, then stop. -# -while ($date->cmp($now) < 0) { - local $dateStr = $date->printf('%Y-%m'); - # print "date string $dateStr\n"; - push @months, $dateStr; - - # move on one month - $date = $date->calc($oneMonth); -} - -1; diff --git a/charting/by_registrar.py b/charting/by_registrar.py deleted file mode 100755 index ff3428d0..00000000 --- a/charting/by_registrar.py +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/env python - -''' -Analyse a SAML metadata file and build a histogram of entities binned against -their registrar. -''' - -from xml.dom.minidom import parse -from urllib import urlopen -from datetime import date -import sys - -REGISTRAR_NAME = { - - # eduGAIN participants - "http://eduid.at": "AT", - "http://federation.belnet.be/": "BE", - "http://cafe.rnp.br": "BR", - "http://www.canarie.ca": "CA", - "http://cofre.reuna.cl/": "CL", - "https://www.carsi.edu.cn": "CN", - "http://www.srce.hr": "HR", - "http://www.eduid.cz/": "CZ", - "https://www.wayf.dk": "DK", - "http://www.csc.fi/haka": "FI", - "https://federation.renater.fr/": "FR", - "https://www.aai.dfn.de": "DE", - "http://aai.grnet.gr/": "GR", - "http://eduid.hu": "HU", - "http://www.heanet.ie": "IE", - "http://www.idem.garr.it/": "IT", - "http://laife.lanet.lv/": "LV", - "http://feide.no/": "NO", - "http://aai.arnes.si": "SI", - "http://www.rediris.es/": "ES", - "http://www.swamid.se/": "SE", - "http://rr.aai.switch.ch/": "CH", - "http://www.surfconext.nl/": "NL", - "http://ukfederation.org.uk": "UK", - - # Joining eduGAIN - "http://aai.pionier.net.pl": "PL", - - # not yet eduGAIN members - "https://incommon.org": "US", -} - -def regAuth(uri): - ''' - Returns a short registrar code, or the long authority URI if none is available. - ''' - try: - return REGISTRAR_NAME[uri] - except KeyError: - return uri - -def display(infile, split): - doc = parse(infile) - - # Pull out all of the RegistrationInfo elements, one per entity - registrationInfos = doc.getElementsByTagNameNS("urn:oasis:names:tc:SAML:metadata:rpi", - "RegistrationInfo") - - counts = dict(); - - for info in registrationInfos: - auth = regAuth(info.getAttribute("registrationAuthority")) - try: - counts[auth] += 1 - except KeyError: - counts[auth] = 1 - - counts = sorted(counts.items(), key=lambda item: item[1], reverse=True) - - first_counts = counts[0:split] - rest_counts = counts[split:] - for e in first_counts: - print "%10s: %d" % (e[0], e[1]) - print "%10s: %d" % ("other", sum([e[1] for e in rest_counts])) - -if len(sys.argv) == 2: - display(sys.argv[1], 9) -else: - cache_file = date.today().strftime("cache/%Y-%m.xml") - print "Most recent monthly UK federation production aggregate (%s):" % (cache_file) - display(cache_file, 9) - - print - - print "Current eduGAIN production aggregate:" - display(urlopen("http://mds.edugain.org/"), 9) diff --git a/charting/fetch.pl b/charting/fetch.pl deleted file mode 100755 index 47d3e51e..00000000 --- a/charting/fetch.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env perl - -# -# fetch.pl -# -use warnings; -use File::stat; -use Months; - -# Call git on the products directory -my $git = "/usr/bin/env git --git-dir ../../ukf-products/.git"; - -$fn1 = 'aggregates/ukfederation-metadata.xml'; -$fn2 = 'aggregates/ukfederation-stats.html'; - -foreach $month (@months) { - print "Fetching $month..."; - - # Find the commit immediately prior to the start of that month. - my $instant = "$month-01T00:00:00Z"; - my $commit = `$git rev-list -n 1 --before=$instant master`; - chomp $commit; - print "$commit"; - - my $dest1 = "cache/$month.xml"; - if (!-e $dest1) { - system("$git show $commit:$fn1 >$dest1"); - } - - my $dest2 = "cache/$month.html"; - if (!-e $dest2) { - system("$git show $commit:$fn2 >$dest2"); - } - - print "\n"; -} diff --git a/charting/mdui.pl b/charting/mdui.pl deleted file mode 100755 index 2651703b..00000000 --- a/charting/mdui.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env perl - -# -# mdui.pl -# -use warnings; -use lib '.'; -use Months; - -# Parse command line arguments -use Getopt::Long; -my $allMonths; -my $oneYear; -GetOptions('all' => \$allMonths, 'year' => \$oneYear); - -# By default, only show results for the most recent month -if ($allMonths) { - # leave table intact -} elsif ($oneYear) { - # reduce months table to just the last 12 entries - @months = @months[-12..-1]; -} else { - # reduce months table to one element - @months = @months[-1..-1]; -} - -# ingest files -foreach $month (@months) { - print "Processing $month\n"; - - my $command = "xsltproc statistics_mdui.xsl cache/$month.xml"; - # print "command is $command\n"; - system($command); # || print "ignoring claimed failure in sub command\n"; - # print "xsltproc run on $fn\n"; - print "\n"; -} diff --git a/charting/requestedattribute.pl b/charting/requestedattribute.pl deleted file mode 100755 index 06ba6ce6..00000000 --- a/charting/requestedattribute.pl +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env perl - -# -# requestedattribute.pl -# -# Extracts statistics about SPs with RequestedAttribute elements from the published metadata. -# -use warnings; -use lib "."; -use Months; - -# Parse command line arguments -use Getopt::Long; -my $allMonths; -my $oneYear; -GetOptions('all' => \$allMonths, 'year' => \$oneYear); - -# By default, only show results for the most recent month -if ($allMonths) { - # leave table intact -} elsif ($oneYear) { - # reduce months table to just the last 12 entries - @months = @months[-12..-1]; -} else { - # reduce months table to one element - @months = @months[-1..-1]; -} - -# print header. must be kept in sync with what comes out of requestedattribute.xsl -print "# month, number of SPs, number with AttributeConsumingService, percent with ACS\n"; - -# ingest files -foreach $month (@months) { - my $fn = "cache/$month.xml"; - open(TXT, "xsltproc requestedattribute.xsl $fn|") || die "could not open input file"; - ($sps, $acs) = split /\t/, ; - chomp $acs; - $proportion = 0; - if ( $sps > 0 ) { $proportion = int (100 * $acs / $sps) ; } - print "${month}\t${sps}\t${acs}\t${proportion}\n"; - close TXT; -} - diff --git a/charting/requestedattribute.xsl b/charting/requestedattribute.xsl deleted file mode 100644 index c266f62a..00000000 --- a/charting/requestedattribute.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/charting/saml2.pl b/charting/saml2.pl deleted file mode 100755 index 0542f210..00000000 --- a/charting/saml2.pl +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env perl - -# -# saml2.pl -# -# Extracts statistics about SAML 2 adoption from the published metadata. -# -use warnings; -use lib "."; -use Months; - -# Parse command line arguments -use Getopt::Long; -my $allMonths; -GetOptions('all' => \$allMonths); - -# By default, only show results for the most recent month -if (!$allMonths) { - # reduce months table to one element - my $oneMonth = pop @months; - @months = ( $oneMonth ); -} - -# ingest files -foreach $month (@months) { - my $fn = "cache/$month.xml"; - open(TXT, "xsltproc saml2.xsl $fn|") || die "could not open input file"; - $_ = ; - chop; - # print "$month: $_\n"; - my ($entities, $idps, $sps, $saml2total, $saml2idp, $saml2sp) = split; - if ($entities == 0) { - # print "skipping $month: $_\n"; - next; - } - my $mPrefix = $allMonths ? "$month: " : ''; - my $oRatio = $saml2total/$entities; - push @overallRatio, "$mPrefix$oRatio"; - my $iRatio = $saml2idp/$idps; - push @idpRatio, "$mPrefix$iRatio"; - my $sRatio = $saml2sp/$sps; - push @spRatio, "$mPrefix$sRatio"; - my $p = ($saml2idp/$idps)*($saml2sp/$sps); - push @product, "$mPrefix$p"; - close TXT; -} - -print "idp\n"; -foreach $ratio (@idpRatio) { - print "$ratio\n"; -} - -print "sp\n"; -foreach $ratio (@spRatio) { - print "$ratio\n"; -} - -print "overall\n"; -foreach $ratio (@overallRatio) { - print "$ratio\n"; -} - -print "product\n"; -foreach $ratio (@product) { - print "$ratio\n"; -} - -1; diff --git a/charting/saml2.xsl b/charting/saml2.xsl deleted file mode 100644 index 04dd4455..00000000 --- a/charting/saml2.xsl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/charting/scopes.pl b/charting/scopes.pl deleted file mode 100755 index 8a8c6692..00000000 --- a/charting/scopes.pl +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env perl - -# -# scopes.pl -# -# Extracts statistics about number of scopes from the published metadata. -# -use warnings; -use lib "."; -use Months; - -# Parse command line arguments -use Getopt::Long; -my $allMonths; -my $oneYear; -GetOptions('all' => \$allMonths, 'year' => \$oneYear); - -# By default, only show results for the most recent month -if ($allMonths) { - # leave table intact -} elsif ($oneYear) { - # reduce months table to just the last 12 entries - @months = @months[-12..-1]; -} else { - # reduce months table to one element - @months = @months[-1..-1]; -} - -# ingest files -foreach $month (@months) { - my $fn = "cache/$month.xml"; - my %scopes; - open(TXT, "xsltproc scopes.xsl $fn|") || die "could not open input file"; - while () { - chop; - my $scope = $_; - $scopes{$scope} = 1; - } - my $prefix = scalar(@months) == 1 ? '' : "$month: "; - my $c = scalar(keys(%scopes)); - push @count, "$prefix$c"; - close TXT; -} - -print "count\n"; -foreach $n (@count) { - print "$n\n"; -} - -1; diff --git a/charting/scopes.xsl b/charting/scopes.xsl deleted file mode 100644 index 76e808c2..00000000 --- a/charting/scopes.xsl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/charting/sizes.pl b/charting/sizes.pl deleted file mode 100755 index 7f9fa924..00000000 --- a/charting/sizes.pl +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/env perl - -# -# sizes.pl -# -use warnings; -use lib "."; -use File::stat; -use Months; - -# Parse command line arguments -use Getopt::Long; -my $allMonths; -my $oneYear; -GetOptions('all' => \$allMonths, 'year' => \$oneYear); - -# By default, only show results for the most recent month -if ($allMonths) { - # leave table intact -} elsif ($oneYear) { - # reduce months table to just the last 12 entries - @months = @months[-12..-1]; -} else { - # reduce months table to one element - @months = @months[-1..-1]; -} - -# ingest files -foreach $month (@months) { - print "Processing $month\n"; - - # - # Process the archived file, representing all entities, - # including those imported from other federations. - # - my $fn = "cache/$month.xml"; - my $stat = stat($fn); - my $all_size = $stat->size; - my $all_count = int(`grep 'size; - my $our_count = int(`grep ' - - - - - - - - - - - - - Total entities - - - - - Identity providers - - - - - Service providers - - - - - - - - - - - - : - - - - - - - mdui:UIInfo - - - - - - mdui:Logo - - - - - - mdui:Description - - - - - - mdui:DisplayName - - - - - - mdui:Keywords - - - - - - mdui:InformationURL - - - - - - mdui:PrivacyStatementURL - - - - - - mdui:DiscoHints - - - - - - mdui:IPHint - - - - - - mdui:DomainHint - - - - - - mdui:GeolocationHint - - - - - - - - - - - - - - - - : - - ( - - ) - - - - diff --git a/ci-download.properties b/ci-download.properties new file mode 100644 index 00000000..287cb774 --- /dev/null +++ b/ci-download.properties @@ -0,0 +1,15 @@ +# +# ci-download.properties +# +# Properties defined for the env=ci-download environment, the part of the +# continuous integration job that downloads an eduGAIN aggregate. +# + +# Shared workspace location is assumed to be under the current directory. +shared.ws.dir=${basedir}/work + +# +# Cached eduGAIN download goes into a different directory so that it +# persists over comparison runs. +# +mda.output.edugain.download=${shared.ws.dir}/temp/edugain-download.xml diff --git a/ci-thin.properties b/ci-thin.properties new file mode 100644 index 00000000..67c9702a --- /dev/null +++ b/ci-thin.properties @@ -0,0 +1,14 @@ +# +# ci-thin.properties +# +# Properties defined for the env=ci-thin environment, the part of the +# continuous integration job that runs the test on the thinned data. +# + +# Shared workspace location is assumed to be under the current directory. +shared.ws.dir=${basedir}/work + +# +# Location of the thinned version of the downloaded eduGAIN aggregate. +# +mda.output.edugain.download=${shared.ws.dir}/temp/edugain-thin.xml diff --git a/dev.properties b/dev.properties index 392d0c43..f6cc2353 100644 --- a/dev.properties +++ b/dev.properties @@ -6,3 +6,9 @@ # Shared workspace location is assumed to be the parent directory. shared.ws.dir=${basedir}/.. + +# +# Cached eduGAIN download goes into a different directory so that it +# persists over comparison runs. +# +mda.output.edugain.download=${shared.ws.dir}/temp/edugain-download.xml diff --git a/hv1-happ-001.properties b/hv1-happ-001.properties new file mode 100644 index 00000000..5aca5a65 --- /dev/null +++ b/hv1-happ-001.properties @@ -0,0 +1,23 @@ +# +# hv1-happ-001.properties +# +# Properties defined for the env=hv1-happ-001 deployment environment. +# +# This is testing the new HSM (installed in December 2021) +# + +# +# Location of the PKCS#11 configuration file for the Thales HSM. +# +sign.uk.pkcs11Config = ${basedir}/mdx/uk/nshield202112.cfg + +# +# Signing key alias within the keystore. +# +sign.uk.keyAlias = UKAMF_Signing_Key + +# +# Give Java processes plenty of headroom in production. +# Update this whenever the value in build.xml is updated. +# +java.max.memory = 2048m diff --git a/mdx/_rules/check_aggregate.xsl b/mdx/_rules/check_aggregate.xsl deleted file mode 100644 index 44337a70..00000000 --- a/mdx/_rules/check_aggregate.xsl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - duplicate entityID: - - - - - - - diff --git a/mdx/_rules/check_algsupport.xsl b/mdx/_rules/check_algsupport.xsl index b9a0962d..273b33f5 100644 --- a/mdx/_rules/check_algsupport.xsl +++ b/mdx/_rules/check_algsupport.xsl @@ -42,7 +42,7 @@ - + alg: diff --git a/mdx/_rules/check_coco_v2_support.xsl b/mdx/_rules/check_coco_v2_support.xsl new file mode 100644 index 00000000..37f8531c --- /dev/null +++ b/mdx/_rules/check_coco_v2_support.xsl @@ -0,0 +1,42 @@ + + + + + + + + + + + REFEDS Data Protection Code of Conduct support only applies to identity provider entities + + + + diff --git a/mdx/_rules/check_entityid_prefix.xsl b/mdx/_rules/check_entityid_prefix.xsl index bf53c54a..0d1ad36b 100644 --- a/mdx/_rules/check_entityid_prefix.xsl +++ b/mdx/_rules/check_entityid_prefix.xsl @@ -22,9 +22,10 @@ - + entity ID does not start with acceptable prefix diff --git a/mdx/_rules/check_future_1.xsl b/mdx/_rules/check_future_1.xsl index c6d5d479..ed05b114 100644 --- a/mdx/_rules/check_future_1.xsl +++ b/mdx/_rules/check_future_1.xsl @@ -27,31 +27,4 @@ --> - - - - more than one SingleLogoutService with SAML 2.0 HTTP-POST binding - - - - - - more than one SingleLogoutService with SAML 2.0 HTTP-POST-SimpleSign binding - - - - - - more than one SingleLogoutService with SAML 2.0 HTTP-Redirect binding - - - - diff --git a/mdx/_rules/check_future_5.xsl b/mdx/_rules/check_future_5.xsl index ca6bcd72..8ebfc25d 100644 --- a/mdx/_rules/check_future_5.xsl +++ b/mdx/_rules/check_future_5.xsl @@ -13,7 +13,6 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" - xmlns:mdxURL="xalan://uk.ac.sdss.xalan.md.URLchecker" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:set="http://exslt.org/sets" @@ -24,16 +23,4 @@ --> - - - - - ' - - ' is not a valid URL: - - - - - diff --git a/mdx/_rules/check_hoksso.xsl b/mdx/_rules/check_hoksso.xsl index d3e50bc1..a581b914 100644 --- a/mdx/_rules/check_hoksso.xsl +++ b/mdx/_rules/check_hoksso.xsl @@ -55,7 +55,7 @@ or on md:AssertionConsumerService. --> + [not(parent::md:SingleSignOnService or parent::md:AssertionConsumerService)]"> hoksso:ProtocolBinding may not appear on @@ -138,8 +138,8 @@ --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')) and + md:*/@Binding = 'urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser']"> holder of key binding requires SAML 2.0 token in AttributeAuthorityDescriptor/@protocolSupportEnumeration @@ -148,8 +148,8 @@ + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')) and + md:*/@Binding = 'urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser']"> holder of key binding requires SAML 2.0 token in SPSSODescriptor/@protocolSupportEnumeration diff --git a/mdx/_rules/check_incmd.xsl b/mdx/_rules/check_incmd.xsl index 2af81047..570e9485 100644 --- a/mdx/_rules/check_incmd.xsl +++ b/mdx/_rules/check_incmd.xsl @@ -44,7 +44,7 @@ - + incmd:contactType must be an absolute URI @@ -53,7 +53,7 @@ - diff --git a/mdx/_rules/check_mdattr.xsl b/mdx/_rules/check_mdattr.xsl index 3b0e6ad3..24a791f4 100644 --- a/mdx/_rules/check_mdattr.xsl +++ b/mdx/_rules/check_mdattr.xsl @@ -39,7 +39,7 @@ + [not(parent::md:EntityDescriptor or parent::md:EntitiesDescriptor)]"> EntityAttributes must only appear within Extensions of EntityDescriptor or EntitiesDescriptor diff --git a/mdx/_rules/check_mdiop.xsl b/mdx/_rules/check_mdiop.xsl index ee0ec366..42fb55d1 100644 --- a/mdx/_rules/check_mdiop.xsl +++ b/mdx/_rules/check_mdiop.xsl @@ -27,8 +27,7 @@ Section 2.5.1: at least one representation must appear. --> + [not((ds:KeyInfo/ds:KeyValue) or (ds:KeyInfo/ds:X509Data/ds:X509Certificate))]"> KeyDescriptor does not contain a key representation diff --git a/mdx/_rules/check_mdrpi.xsl b/mdx/_rules/check_mdrpi.xsl index 0530f57a..00e38ae7 100644 --- a/mdx/_rules/check_mdrpi.xsl +++ b/mdx/_rules/check_mdrpi.xsl @@ -39,7 +39,7 @@ + [not((parent::md:EntityDescriptor) or (parent::md:EntitiesDescriptor))]"> RegistrationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor @@ -74,7 +74,7 @@ registrationInstant values MUST be expressed in the UTC timezone using the 'Z' timezone identifier. --> - @@ -120,13 +120,13 @@ PublicationInfo MUST appear within the Extensions of either EntitiesDescriptor or EntityDescriptor. --> - + PublicationInfo must only appear within an Extensions element + [not((parent::md:EntityDescriptor) or (parent::md:EntitiesDescriptor))]"> PublicationInfo must only appear within Extensions of EntityDescriptor or EntitiesDescriptor @@ -162,8 +162,7 @@ Restrict the elements in this namespace which can appear directly within md:Extensions to the two defined container elements. This will catch mis-spelled containers. --> - + misspelled or misplaced mdrpi element within md:Extensions: diff --git a/mdx/_rules/check_mdui.xsl b/mdx/_rules/check_mdui.xsl index 547a524e..5f989a35 100644 --- a/mdx/_rules/check_mdui.xsl +++ b/mdx/_rules/check_mdui.xsl @@ -18,7 +18,6 @@ xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" - xmlns:mdxURL="xalan://uk.ac.sdss.xalan.md.URLchecker" xmlns:set="http://exslt.org/sets" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> @@ -46,7 +45,7 @@ to the two defined container elements. This will catch mis-spelled containers. --> + [not(local-name()='UIInfo') and not(local-name()='DiscoHints')]"> misspelled or misplaced mdui element within md:Extensions: @@ -71,7 +70,7 @@ + [not(parent::md:IDPSSODescriptor or parent::md:SPSSODescriptor)]"> UIInfo appearing outside SSO descriptor element ( @@ -131,103 +130,6 @@ - - - - - - - mdui:Logo contains line break - - - - - - mdui:Logo contains non-breaking space - - - - - - - - mdui:Logo URL does not start with https:// - - - - - - - - - - mdui: - - ' - - ' is not a valid URL: - - - - - - - - - - - - mdui: - - ' - - ' is not a valid URL: - - - - - - - - - - mdui: - - ' - - ' is not a valid URL: - - - - - SAML 1.1 AttributeAuthority missing appropriately bound AttributeService @@ -45,8 +45,8 @@ Use of SAML 1.0 bindings requires SAML 1.1 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:1.1:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:1.0:')]]"> SAML 1.0 binding requires SAML 1.1 token in IDPSSODescriptor/@protocolSupportEnumeration @@ -58,8 +58,8 @@ Use of SAML 1.0 bindings requires SAML 1.1 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:1.1:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:1.0:')]]"> SAML 1.0 binding requires SAML 1.1 token in AttributeAuthorityDescriptor/@protocolSupportEnumeration @@ -71,8 +71,8 @@ Use of SAML 1.0 bindings requires SAML 1.1 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:1.1:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:1.0:')]]"> SAML 1.0 binding requires SAML 1.1 token in SPSSODescriptor/@protocolSupportEnumeration diff --git a/mdx/_rules/check_saml2.xsl b/mdx/_rules/check_saml2.xsl index 0f1fed85..b97520b8 100644 --- a/mdx/_rules/check_saml2.xsl +++ b/mdx/_rules/check_saml2.xsl @@ -47,9 +47,8 @@ A SAML 2.0 IdP with an AttributeAuthority needs an AttributeService with an appropriate Binding. --> + [contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol') and + not(md:AttributeService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:SOAP'])]"> SAML 2.0 AttributeAuthority missing appropriately bound AttributeService @@ -61,8 +60,7 @@ --> + [not((md:KeyDescriptor[descendant::ds:X509Data and @use='encryption']) or ((md:KeyDescriptor[descendant::ds:X509Data and not(@use)])))]"> SAML 2.0 SP has no encryption key @@ -72,8 +70,8 @@ Use of SAML 2.0 bindings requires SAML 2.0 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:2.0:bindings:')]]"> SAML 2.0 binding requires SAML 2.0 token in IDPSSODescriptor/@protocolSupportEnumeration @@ -85,8 +83,8 @@ Use of SAML 2.0 bindings requires SAML 2.0 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:2.0:bindings:')]]"> SAML 2.0 binding requires SAML 2.0 token in AttributeAuthorityDescriptor/@protocolSupportEnumeration @@ -98,8 +96,8 @@ Use of SAML 2.0 bindings requires SAML 2.0 in protocolSupportEnumeration. --> + [not(contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')) and + md:*/@Binding[starts-with(., 'urn:oasis:names:tc:SAML:2.0:bindings:')]]"> SAML 2.0 binding requires SAML 2.0 token in SPSSODescriptor/@protocolSupportEnumeration diff --git a/mdx/_rules/check_saml2int.xsl b/mdx/_rules/check_saml2int.xsl index 42f30770..596c2faa 100644 --- a/mdx/_rules/check_saml2int.xsl +++ b/mdx/_rules/check_saml2int.xsl @@ -32,8 +32,10 @@ + [not( + (md:NameIDFormat[.='urn:oasis:names:tc:SAML:2.0:nameid-format:persistent']) or + (md:NameIDFormat[.='urn:oasis:names:tc:SAML:2.0:nameid-format:transient']) + )]"> SP excludes both SAML 2 name identifier formats @@ -124,16 +126,14 @@ --> + [not((md:KeyDescriptor[descendant::ds:X509Data][@use='signing']) or (md:KeyDescriptor[descendant::ds:X509Data][not(@use)]))]"> SAML 2.0 IdP has no embedded signing key + [not((md:KeyDescriptor[descendant::ds:X509Data][@use='signing']) or (md:KeyDescriptor[descendant::ds:X509Data][not(@use)]))]"> SAML 2.0 AttributeAuthority has no embedded signing key diff --git a/mdx/_rules/check_saml2meta.xsl b/mdx/_rules/check_saml2meta.xsl index 42b5fad4..3a3cda52 100644 --- a/mdx/_rules/check_saml2meta.xsl +++ b/mdx/_rules/check_saml2meta.xsl @@ -11,7 +11,6 @@ --> - - - - - - - Location is not a valid URL: - - - - - - - - - - - - ResponseLocation is not a valid URL: - - - - - - - - - - - OrganizationURL ' - - ' is not a valid URL: - - - - - - diff --git a/mdx/_rules/check_shibboleth.xsl b/mdx/_rules/check_shibboleth.xsl index 12e87c7a..a1b83705 100644 --- a/mdx/_rules/check_shibboleth.xsl +++ b/mdx/_rules/check_shibboleth.xsl @@ -36,8 +36,10 @@ We perform a very cursory test for this by insisting that they start with either "http://" or "https://". --> - + OrganizationURL '' does not start with acceptable prefix diff --git a/mdx/_rules/check_sirtfi2.xsl b/mdx/_rules/check_sirtfi2.xsl new file mode 100644 index 00000000..ca01e9b5 --- /dev/null +++ b/mdx/_rules/check_sirtfi2.xsl @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + Sirtfi version 2 requires a REFEDS security contact + + + + + + + + Sirtfi version 2 requires a REFEDS security contact to have a GivenName + + + + + Sirtfi version 2 requires a REFEDS security contact to have an EmailAddress + + + + + + + + Sirtfi version 2 requires the entity to also support the original Sirtfi entity attribute + + + + + + diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml index 5ab7a9fc..69040fb3 100644 --- a/mdx/at_aconet/beans.xml +++ b/mdx/at_aconet/beans.xml @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - - + @@ -120,7 +120,7 @@ Fetch the eduGAIN export entities as a collection. --> - + diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml index f3db7439..b5bd033e 100644 --- a/mdx/at_aconet/verbs.xml +++ b/mdx/at_aconet/verbs.xml @@ -95,7 +95,7 @@ a while to resolve. --> + p:keepingEntities="false"> diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml index 5be87f8a..1c982bbe 100644 --- a/mdx/common-beans.xml +++ b/mdx/common-beans.xml @@ -22,7 +22,7 @@ - + - - - + http://www.w3.org/2001/04/xmldsig-more#md5 - + http://www.w3.org/2001/04/xmldsig-more#rsa-md5 @@ -103,13 +98,13 @@ --> - + http://www.w3.org/2000/09/xmldsig#sha1 http://www.w3.org/2001/04/xmldsig-more#md5 - + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1 @@ -118,29 +113,31 @@ - - - - - - - - + + - - + - + + + + + + + + + + + + - - - + @@ -392,7 +389,7 @@ - + @@ -433,6 +430,7 @@ + @@ -449,6 +447,7 @@ + @@ -501,6 +500,7 @@ + @@ -547,6 +547,7 @@ + @@ -675,7 +676,7 @@ any items that had errors. Items with just warnings are retained. --> - + @@ -691,7 +692,7 @@ Warnings are not announced, and do not cause termination. --> - + @@ -713,16 +714,26 @@ QNames for SAML metadata elements. --> + + + + + + + + + + @@ -962,11 +973,10 @@ These options can be removed once the underlying issue has been resolved. --> - - @@ -1200,7 +1209,7 @@ that is left to the caller. --> - + @@ -1210,7 +1219,7 @@ other than the ones we accept from partners. --> + p:keeping="true"> @@ -1243,42 +1252,13 @@ + - - - - - - - - - - - - - - - - - - - - - - + @@ -1292,7 +1272,7 @@ namespaces in the document ready for serialisation. --> - + diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml deleted file mode 100644 index a937917c..00000000 --- a/mdx/int_cobweb/beans.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mdx/int_cobweb/cobweb.pem b/mdx/int_cobweb/cobweb.pem deleted file mode 100644 index b515a826..00000000 --- a/mdx/int_cobweb/cobweb.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDwTCCAqmgAwIBAgIJANQTFZkwy3GRMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV -BAYTAkdCMREwDwYDVQQIDAhTY290bGFuZDESMBAGA1UEBwwJRWRpbmJ1cmdoMSAw -HgYDVQQKDBdVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwGA1UECwwFRURJTkEx -DzANBgNVBAMMBmNvYndlYjAeFw0xMzA2MDQxMjIxMDdaFw0yMzA2MDIxMjIxMDda -MHcxCzAJBgNVBAYTAkdCMREwDwYDVQQIDAhTY290bGFuZDESMBAGA1UEBwwJRWRp -bmJ1cmdoMSAwHgYDVQQKDBdVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwGA1UE -CwwFRURJTkExDzANBgNVBAMMBmNvYndlYjCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAMG2jx3EtN1qg0GmHkJMv3dhe1+VwTwc5hhWyEF7uNmSXHgsLqr/ -tqcwGU44ZkItsfyuwpLos7EVB4Yjwr/acoj7J9Rpr9nhpmJHT3Bdz/hruNCskBv7 -5euEKnz7avoiC/tuPBDw5WFvZnFvmX0WitdYkneF/TglzlXHj17+t0aW5m5Jpmnt -txh3Ei5Bgc1IpWUDfoiBmAIDxsGY9WtZw8jFqfeJ9Mqx3nL/4RthxybWlABsc/OG -Kttn0RwMwEWbxyKju2E+tlvAuzD6S51f3isZVTRg2vq9pQpNa0psFQUIGXaetJC2 -iHsvtrRh2J1ZZGdwMDw2Cm6et0SPkb3JcAUCAwEAAaNQME4wHQYDVR0OBBYEFJ1f -LUWCtlexZlUN1TYKSufHDX6AMB8GA1UdIwQYMBaAFJ1fLUWCtlexZlUN1TYKSufH -DX6AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAF9jSeYRG88AQTuV -yN82Jr2NWwACesZ/x6eQp/UznAlx2M8mqqPBtdWpFG3Qwwl/sds6kFZTMBgCBX8R -tr2CUPMoLGJJv36GXvnc4EHXaQ21SIL6Qqs4UzzBX5KevQ8Gs7rK6UWWOsG7mmsx -jlDrX1bfKd97yLZesDoZ7uoaLUM6ll6HrChBDPIhju6GcfGxcNgSe7EwHho/Uj23 -ntdXeYamcn4bgh3ZOBmm/d+AjjEZpKFsS5qF2j155nV+h5jZB3ZIpFlVWrW0Bmlk -mhrM4/yu4l8QWjzkRwKJahD0gJLiwP2gyXH9BCpYFD3biG94wtmMqk2wDiXdjIJd -R55Ymss= ------END CERTIFICATE----- diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml deleted file mode 100644 index 5cb06d8b..00000000 --- a/mdx/int_cobweb/verbs.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml index 78a0412f..5229e2f0 100644 --- a/mdx/int_edugain/beans.xml +++ b/mdx/int_edugain/beans.xml @@ -29,9 +29,13 @@ + + + + + + + + + + + - - + - + - diff --git a/mdx/int_edugain/download.xml b/mdx/int_edugain/download.xml new file mode 100644 index 00000000..844f12f9 --- /dev/null +++ b/mdx/int_edugain/download.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml index de8ca005..bc936b1b 100644 --- a/mdx/int_edugain/verbs.xml +++ b/mdx/int_edugain/verbs.xml @@ -22,11 +22,6 @@ --> - - - @@ -95,7 +90,7 @@ diff --git a/mdx/int_reep/readme.md b/mdx/int_reep/readme.md deleted file mode 100644 index 9059b91d..00000000 --- a/mdx/int_reep/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# `int_reep` Channel - -REEP (RE:EP) is at . - -Ian Young's blog post authenticating the key is at . diff --git a/mdx/int_reep/reep.pem b/mdx/int_reep/reep.pem deleted file mode 100644 index 6627d0ab..00000000 --- a/mdx/int_reep/reep.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE5DCCAswCCQCX5/wCyztEuTANBgkqhkiG9w0BAQsFADA0MRQwEgYDVQQDEwtS -RUVQIFNpZ25lcjEPMA0GA1UEChMGVGVyZW5hMQswCQYDVQQGEwJOTDAeFw0xNDA1 -MTgxNjU0NTVaFw0zNDA1MTMxNjU0NTVaMDQxFDASBgNVBAMTC1JFRVAgU2lnbmVy -MQ8wDQYDVQQKEwZUZXJlbmExCzAJBgNVBAYTAk5MMIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAraN3xmgiLsThsSSopG8j4dc3HHGSlhN8o0dZrmbkXUlt -Amp/xjUesSRAguNgxETM42Cpr9A/YBqOJy7IVODsDolsXMvxY1Nyo7ddplEdskaw -Tj2llNmGbeeznlUem5WCDO+1KQqHHtm4SLumquXVswmWIbQNK6rIJ4NJsHAK7N4P -gTanVz/YPRbFt6z/zRH4Ck+Bc1aF2/koryQLMygVDkHAokIl0S9FZ6oI0gWePrtt -7LzvSCoB/yP3JIjCWoheyI7O9iCfkpcPv2c5H0aWVigWF3uPsEFAhnbCn/PI00L5 -lc8/00REu7MNjGarNoYdy2/E4nE4R4vgw4g04fWlDpbKVoeOOyOZSZMfSsIe/UkN -R7B9zFbWE80laL6dy4WPMS1amovWWVOrZ0fY8EXJ5mEzbtLk6/LBd3dnhrx5BH6g -0xTUWQl2sodm/e0xn7M5pRESLhGNPXG88fT4yzgIj5vlE0OCLGUFs7EhNCz+UJ1o -1va8EdpnN8HG3RwNOTd0S1a9N9Q30VLUBjKK3bP/Mi0PcIKphgpfykIgStziIa59 -aqyVFSztSJiICiSvfWGDDOW4NneS+2iuNhq89lBxXdIE1mvdBZBcMUe7DQm/EGRw -AFlvqrXdnxtMHzgRW9Fp/vQEeuWbiFnvmpzcMja2Pn4jPg/RhgzLXyXIPYMm69EC -AwEAATANBgkqhkiG9w0BAQsFAAOCAgEASmjLZdqxm1OA4xCV/iDJp5h3rFG71VfO -3HIBH8pywUuygd90+MogvmMwUTWGeFqltHmSNM8qMtqzd6lLA9fu+BRnNt7ZLTSt -r9auetvNtZ/637njRXVKeJnf2HWjI7B0uO1FjStjS2/CQ5DnAhaxlkbomGEQL4Jq -sEijx6MB+fibNfkYibbDNjaFVMPtGQChbmudhQ7e3GjAoRVR5SLZncJQcXREwxhU -D9BOhtLEBnnhBX+h12PUyJ16PvkRiysxldltYZ5Ai+lAIlq+I6xwsuyALpZSKKVl -QfwcQh0j1PZKNF6cw315Zj/5h5HeV7ORCdSsgec9Pp8a1sguvNl6SnjqZzrli5ni -vyrkStaYMuCS09QIfi3OtafZUw5T0i8OjS3oCETAIyYuGQHRP9M5zG9ViuOvuUPD -I7Q0KHbFzHb+9NBTSZsuusE9FYojcb43XR/r2/vBQF7RcSqlbjqtVZW9+pZtRBxf -p8b7s3/eSqhEgqdVR0szXkEMrbx2UxbwFD19CnLn2wbmtRqlPwzX9zfdD4GUeko3 -WiG1NLAsc9vgApu0+n3km+CrizXOI/4qWMGA1dY7cOExaBkuFFavs/iI+rjSFg/I -MlRaKTd4WBSuPjMoHrH+1KGsu/2TWK0iQ3VuoJchMnuEMocVPqRU4E8xw/8K+BYW -j2BnINSs6EE= ------END CERTIFICATE----- diff --git a/mdx/int_reep/reep.pem.asc b/mdx/int_reep/reep.pem.asc deleted file mode 100644 index e4c478e7..00000000 --- a/mdx/int_reep/reep.pem.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - https://gpgtools.org - -iQIcBAABCAAGBQJTfgP4AAoJEJqATpfXB5x31X8QAJavS8CTMQu34J+6ihQGbnjj -VheO8XUK8iMVe0aI4dT8T94ot3jnR7w6StfeGy3G0ASP9OrAPzlN5rqbkqE75wnu -/s0oiFrGbY+TWhY2ptNkozWuE27jMTJmjJGbgmHejrQDiyIR7mTuZf5K+U8a2hZV -DlqYfSjzlLeuVh/H+ygnMHSn/UZZRQ7rqz7DPwF1SAXHBiW+Q1PsuOgKTTrZQa2X -PMQG3vSfZPWdoEB3pRApAXZsUqhxe3wLvJWkgCQ0mMhXvO1J5CvaISnDjuUm2klt -qCeOhGaAlWumL1Xr8Y6Gi/p5ATn/SRjlg3uDa4f3uVpYRGmqZwoQEvq6JkGqhDyE -mEoVGD4Ud4MfUtZkgLXOJ22RODjckkJbBySFYJjosuQ9w5rviJwPMBBjTZw4lNBS -58VGy6puzEkCcJzlVynzjQi9bn83EDVNKD00Q8cOSJxRjqwQ0YYIM22EypDNmgiV -ZS7xxmClwp9QS+r7x+0+xkNnG4IQHRZXvJglIMh0PyrjkDloGw6AUUOYNyHQOnqw -URwjR5cpYZ2rZ3fRUFtCgaZ+tvdfbVxTBG8ZuqGw6zzPho3AEXwqW/PtJTej1aQr -Mxm7xBc21URhXYkSr98qxsQyIJikNRHS2DkEWybDnNBc4SBbl4SjmThRNnxjUiC8 -UBnJ48ZYrmFMumowGqoO -=wDWv ------END PGP SIGNATURE----- diff --git a/mdx/mda-beans.xml b/mdx/mda-beans.xml deleted file mode 100644 index ea592084..00000000 --- a/mdx/mda-beans.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mdx/strip-mdui-logo-length.xsl b/mdx/strip-mdui-logo-length.xsl index 18544d73..ad387030 100644 --- a/mdx/strip-mdui-logo-length.xsl +++ b/mdx/strip-mdui-logo-length.xsl @@ -11,7 +11,6 @@ xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" - xmlns:mdxURL="xalan://uk.ac.sdss.xalan.md.URLchecker" xmlns:set="http://exslt.org/sets" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml index e3a8f5a0..19367897 100644 --- a/mdx/test/beans.xml +++ b/mdx/test/beans.xml @@ -23,7 +23,7 @@ Fetch and process the entities as a collection. --> - + diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml index 4ae862cf..3bc5b5fa 100644 --- a/mdx/uk/beans.xml +++ b/mdx/uk/beans.xml @@ -42,7 +42,7 @@ administrative - + @@ -107,7 +107,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -132,7 +132,7 @@ - @@ -177,7 +177,7 @@ This bean contains the contents of the members.xml file as a DOM Document. --> - + @@ -190,7 +190,7 @@ This bean loads the schema for the members.xml file as a DOM Document. --> - + @@ -238,9 +238,9 @@ Check against UKf-specific list of compromised RSA keys. --> - - + @@ -271,7 +271,7 @@ described by the EmailAddressStringValidator. In particular, this requires the "mailto:" scheme." --> - @@ -335,6 +335,14 @@ + + + - + @@ -398,6 +406,15 @@ + + + + + - + @@ -426,7 +442,7 @@ - + - + @@ -445,7 +461,7 @@ @@ -601,7 +617,7 @@ Fetch the export entities as a collection. --> - + diff --git a/mdx/uk/check_uk_mdattr.xsl b/mdx/uk/check_uk_mdattr.xsl index cd00198b..0184e9c7 100644 --- a/mdx/uk/check_uk_mdattr.xsl +++ b/mdx/uk/check_uk_mdattr.xsl @@ -98,6 +98,7 @@ /saml:AttributeValue [. != 'http://refeds.org/category/research-and-scholarship'] [. != 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1'] + [. != 'https://refeds.org/category/code-of-conduct/v2'] "> diff --git a/mdx/uk/check_uk_rands.xsl b/mdx/uk/check_uk_rands.xsl index 331aa9d5..dd33eb9c 100644 --- a/mdx/uk/check_uk_rands.xsl +++ b/mdx/uk/check_uk_rands.xsl @@ -37,7 +37,7 @@ [not(md:Extensions/mdrpi:RegistrationInfo/mdrpi:RegistrationPolicy)]"> - SP asserts R&S entity category but has no RegistrationPolicy element. + SP asserts Research and Scholarship entity category but has no RegistrationPolicy element. @@ -57,7 +57,7 @@ [not(md:Extensions/mdrpi:RegistrationInfo/mdrpi:RegistrationPolicy)]"> - IdP supports R&S entity category but has no RegistrationPolicy element. + IdP supports Research and Scholarship entity category but has no RegistrationPolicy element. diff --git a/mdx/uk/discofeeds.xml b/mdx/uk/discofeeds.xml deleted file mode 100644 index 05a7c983..00000000 --- a/mdx/uk/discofeeds.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mdx/uk/edugain-policy.xml b/mdx/uk/edugain-policy.xml index 9136b0e4..5edc6683 100644 --- a/mdx/uk/edugain-policy.xml +++ b/mdx/uk/edugain-policy.xml @@ -43,7 +43,7 @@ --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml index 4e4feae4..22117bf9 100644 --- a/mdx/uk/generate.xml +++ b/mdx/uk/generate.xml @@ -33,11 +33,6 @@ --> - - - @@ -51,28 +46,6 @@ ***************************** --> - - - - - - - - - - - - - - - - - + - - - + + + @@ -114,7 +87,7 @@ the registered metadata. --> - + @@ -136,26 +109,8 @@ - - - - - - - - - - - + - + + p:keeping="false"> @@ -212,7 +167,7 @@ - + - + @@ -305,9 +260,6 @@ - - - @@ -369,7 +321,6 @@ - - + @@ -611,13 +562,12 @@ p:flowName="fallback"/> - @@ -665,7 +615,7 @@ - + - - - @@ -789,11 +736,8 @@ - - - - - - - + - + @@ -1009,13 +950,13 @@ too many UK-specific transformations are performed. --> - + - + - + @@ -1081,17 +1022,17 @@ Fork into new pipelines for the production, fallback and WAYF aggregates. --> - + - + - + - + @@ -1155,13 +1096,13 @@ Fork into new pipelines for additional aggregates. --> - + - + - + diff --git a/mdx/uk/import.xsl b/mdx/uk/import.xsl index 06fc13ee..020898ae 100644 --- a/mdx/uk/import.xsl +++ b/mdx/uk/import.xsl @@ -54,9 +54,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml index 7fd2b581..376bf0a5 100644 --- a/mdx/uk/mdq-multisign.xml +++ b/mdx/uk/mdq-multisign.xml @@ -22,19 +22,6 @@ --> - - - - - - - - - - - - - @@ -60,20 +47,26 @@ --> + + + - + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mdx/uk/nshield202112.cfg b/mdx/uk/nshield202112.cfg new file mode 100644 index 00000000..ab7a284e --- /dev/null +++ b/mdx/uk/nshield202112.cfg @@ -0,0 +1,4 @@ +library=/opt/nfast/toolkits/pkcs11/libcknfast.so +name=nShield +description=nShield Token +slotListIndex=1 diff --git a/mdx/uk/statistics-charting.xsl b/mdx/uk/statistics-charting.xsl deleted file mode 100644 index 04ae4dc4..00000000 --- a/mdx/uk/statistics-charting.xsl +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-            
-            

-
-            Members: 
-            
-            

-
-            Entities: 
-            
-            

-
-               IdPs: 
-            
-            

-
-               SPs: 
-            
-            

-
-            Entities per member: 
-            
-            

-
-            
-            
-            Algorithm support: 
-            
-             of all entities
-            

-
-            
-            
-            GCM support: 
-            
-             of all entities
-            

-
-            
-            
-            Algorithm support: 
-            
-             of SP entities
-            

-
-            
-            
-            GCM support: 
-            
-             of SP entities
-            

-
-            
-            
-            Shibboleth IdP v4: 
-            
-             (
-            
-             of IdPs)
-            

-
-            
-            
-            Shibboleth IdP v3: 
-            
-             (
-            
-             of IdPs)
-            

-
-            
-            
-            

-            SPs without SAML 2.0 support: 
-            
-            

-
-            
-                
-                   
-                
-                : 
-                
-                : 
-                
-                    
-                        
-                    
-                    
-                        (
-                        
-                        )
-                    
-                
-                
-                

-            
-
-            
-                
-            
-
-            
-            
-
-            

-            IdPs without SAML 2.0 support: 
-            
-            

-
-            
-                
-            
-
-            
-            

-
-            
-            
-            Entities with mdui:UIInfo: 
-            
-             (
-            
-            )
-            

-
-            
-            
-            IdPs with mdui:UIInfo: 
-            
-             (
-            
-            )
-            

-
-            
-            
-            SPs with mdui:UIInfo: 
-            
-             (
-            
-            )
-            

-
-            

-
- - - - - - - - Breakdown by software used: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Shibboleth 4.x - - - - - - Shibboleth 3.x - - - - - - Shibboleth 2.x - - - - - - - Shibboleth combined - - - - - - - Other than Shibboleth - - - - - - EZproxy - - - - - - simpleSAMLphp - - - - - - Atypon SAML SP - - - - - - AthensIM - - - - - - Guanxi - - - - - - Athens/Shibboleth gateway - - - - - - OpenAthens Virtual IdP - - - - - - OpenAthens - - - - - - Unknown or other - - - - - - - - - - - - 0 - 0 - 8 - - - - - : - - ( - - ) - - - - - - - : - - - - - () - - - - - - - - - - diff --git a/mdx/uk/statistics.xsl b/mdx/uk/statistics.xsl index 7222b3b6..9aae8d0d 100644 --- a/mdx/uk/statistics.xsl +++ b/mdx/uk/statistics.xsl @@ -23,10 +23,9 @@ xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:math="http://exslt.org/math" xmlns:date="http://exslt.org/dates-and-times" - xmlns:dyn="http://exslt.org/dynamic" xmlns:set="http://exslt.org/sets" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" - exclude-result-prefixes="xsl alg ds init md mdattr mdui saml xsi members ukfedlabel math date dyn set idpdisc" + exclude-result-prefixes="xsl alg ds init md mdattr mdui saml xsi members ukfedlabel math date set idpdisc" version="1.0"> @@ -84,11 +83,6 @@ - - - @@ -1542,7 +1536,7 @@ [@name != 'EZproxy'] [@name != 'OpenAthens'] [@name != 'Guanxi'] - [@name != 'simpleSAMLphp'] + [@name != 'SimpleSAMLphp'] [@name != 'Atypon SAML SP 1.1/2.0'] [@name != 'AthensIM'] [@name != 'Eduserv Gateway'] @@ -1560,11 +1554,11 @@ select="set:difference($entities.ezproxy.in, $entities.ezproxy)"/> + select="$entities.simplesamlphp.in[md:Extensions/ukfedlabel:Software/@name='SimpleSAMLphp']"/> @@ -1717,7 +1711,7 @@ - simpleSAMLphp + SimpleSAMLphp diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml index 05f5c51d..8fea7470 100644 --- a/mdx/uk/verbs.xml +++ b/mdx/uk/verbs.xml @@ -59,41 +59,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + p:keeping="true"> @@ -374,7 +339,7 @@ - + - + @@ -393,7 +358,7 @@ diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml index 8d99949b..8bda14eb 100644 --- a/mdx/us_incommon/beans.xml +++ b/mdx/us_incommon/beans.xml @@ -34,7 +34,7 @@ - + @@ -44,7 +44,7 @@ - - + @@ -108,7 +108,7 @@ Synthesise an export collection by filtering the production entities. --> - + @@ -135,7 +135,7 @@ Filter out all entities not involved in the pilot. --> + p:keepingEntities="true"> https://ligo.org/ligovirgo/cbcnote/shibboleth-sp @@ -148,10 +148,10 @@ Remove all contact information. --> + p:keepingTypes="true"> - + @@ -175,7 +175,7 @@ Fake an export aggregate by aggregating the exported entities. --> - + diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml index 51ba8502..248e0ff7 100644 --- a/mdx/validation-beans.xml +++ b/mdx/validation-beans.xml @@ -12,6 +12,63 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -169,7 +226,7 @@ Composite check for the MDRPI specification. --> - + @@ -209,7 +266,7 @@ Checks for the mdui:IPHint element. --> - + + + + + + + + + + + + + + + + + + + + + + - + + + @@ -281,7 +378,7 @@ p:XSLResource="classpath:_rules/check_rands_support.xsl"/> - + @@ -289,6 +386,25 @@ + + + + + + + + + + + + - + - + p:keylistResource="classpath:net/shibboleth/metadata/keylists/rsa/legacy/debian-1024.txt"/> - + p:KeylistResource="classpath:net/shibboleth/metadata/keylists/rsa/debian-2048.txt"/> - + p:keylistResource="classpath:net/shibboleth/metadata/keylists/rsa/debian-4096.txt"/> - + p:keylistResource="classpath:net/shibboleth/metadata/keylists/rsa/legacy/compromised-1024.txt"/> - + p:keylistResource="classpath:net/shibboleth/metadata/keylists/rsa/compromised-2048.txt"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -640,7 +830,7 @@ CHECK_std --> - + @@ -658,12 +848,15 @@ + + + diff --git a/orchestration.xml b/orchestration.xml new file mode 100644 index 00000000..c9d1cdbf --- /dev/null +++ b/orchestration.xml @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Clearing build directory on node. + + + + Output directory on node cleared. + + + + + Files transferred to node. + + + + Copying tooling from orchestrator ${tooling.dir} to ${node.tooling.dir.url} + + + + + + + + + + + + + + + + + + + + + Copying unsigned aggregates from orchestrator ${build.dir} to ${node.build.dir.url} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collated products on orchestrator + + + + Copying signed products from node + + + + + + + + + + + + + + + + + + + + + Copying mdqcache from node + + + + + + + + + + + + + + + Copying mdqcache to output directory in orchestrator's workspace + + Copying signed aggregates to orchestrator's ukf-products repository + + + + + + + + + + + + + + + + All properties: + + + + diff --git a/preprod.properties b/preprod.properties index c71ba326..e91a0140 100644 --- a/preprod.properties +++ b/preprod.properties @@ -4,11 +4,6 @@ # Properties defined for the env=preprod deployment environment. # -# -# Use the PKCS#11 provider for signatures. -# -sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11 - # # Location of the PKCS#11 configuration file for the Thales HSM. # diff --git a/prod.properties b/prod.properties index 3a1090b6..41f3b326 100644 --- a/prod.properties +++ b/prod.properties @@ -4,11 +4,6 @@ # Properties defined for the env=prod deployment environment. # -# -# Use the PKCS#11 provider for signatures. -# -sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11 - # # Location of the PKCS#11 configuration file for the Thales HSM. # diff --git a/tests/manual/ukf-meta-352/README.md b/tests/manual/ukf-meta-352/README.md new file mode 100644 index 00000000..b1636678 --- /dev/null +++ b/tests/manual/ukf-meta-352/README.md @@ -0,0 +1,8 @@ + +Manual tests for checking Sirtfi version 2 conformance + +Run the following bash command in this directory to see the thrown errors + +```bash +for i in *.xml; do echo $i; xsltproc ../../../mdx/_rules/check_sirtfi2.xsl $i; done +``` diff --git a/tests/manual/ukf-meta-352/both-entity-attributes-as-spec.xml b/tests/manual/ukf-meta-352/both-entity-attributes-as-spec.xml new file mode 100644 index 00000000..9dfb6ece --- /dev/null +++ b/tests/manual/ukf-meta-352/both-entity-attributes-as-spec.xml @@ -0,0 +1,15 @@ + + + + + + https://refeds.org/sirtfi2 + https://refeds.org/sirtfi + + + + diff --git a/tests/manual/ukf-meta-352/both-entity-attributes-separate-attributes.xml b/tests/manual/ukf-meta-352/both-entity-attributes-separate-attributes.xml new file mode 100644 index 00000000..b659e1cf --- /dev/null +++ b/tests/manual/ukf-meta-352/both-entity-attributes-separate-attributes.xml @@ -0,0 +1,17 @@ + + + + + + https://refeds.org/sirtfi2 + + + https://refeds.org/sirtfi + + + + diff --git a/tests/manual/ukf-meta-352/correctly-specified.xml b/tests/manual/ukf-meta-352/correctly-specified.xml new file mode 100644 index 00000000..8f94a096 --- /dev/null +++ b/tests/manual/ukf-meta-352/correctly-specified.xml @@ -0,0 +1,20 @@ + + + + + + https://refeds.org/sirtfi2 + https://refeds.org/sirtfi + + + + + Name of the security contact + mailto:csirt@example.ac.uk + + diff --git a/tests/manual/ukf-meta-352/entity-attribute-contact-with-email.xml b/tests/manual/ukf-meta-352/entity-attribute-contact-with-email.xml new file mode 100644 index 00000000..c4e31921 --- /dev/null +++ b/tests/manual/ukf-meta-352/entity-attribute-contact-with-email.xml @@ -0,0 +1,18 @@ + + + + + + https://refeds.org/sirtfi2 + + + + + mailto:csirt@example.ac.uk + + diff --git a/tests/manual/ukf-meta-352/entity-attribute-contact-with-givenname.xml b/tests/manual/ukf-meta-352/entity-attribute-contact-with-givenname.xml new file mode 100644 index 00000000..4463e155 --- /dev/null +++ b/tests/manual/ukf-meta-352/entity-attribute-contact-with-givenname.xml @@ -0,0 +1,18 @@ + + + + + + https://refeds.org/sirtfi2 + + + + + Name of the security contact + + diff --git a/tests/manual/ukf-meta-352/no-sirtfi-v1.xml b/tests/manual/ukf-meta-352/no-sirtfi-v1.xml new file mode 100644 index 00000000..5cc6f845 --- /dev/null +++ b/tests/manual/ukf-meta-352/no-sirtfi-v1.xml @@ -0,0 +1,19 @@ + + + + + + https://refeds.org/sirtfi2 + + + + + Name of the security contact + mailto:csirt@example.ac.uk + + diff --git a/tests/manual/ukf-meta-352/only-entity-attribute.xml b/tests/manual/ukf-meta-352/only-entity-attribute.xml new file mode 100644 index 00000000..9b140613 --- /dev/null +++ b/tests/manual/ukf-meta-352/only-entity-attribute.xml @@ -0,0 +1,14 @@ + + + + + + https://refeds.org/sirtfi2 + + + + diff --git a/tools/aggregator-cli-0.9.2/lib/aggregator-cli-0.9.2.jar b/tools/aggregator-cli-0.9.2/lib/aggregator-cli-0.9.2.jar deleted file mode 100644 index 8b607aa9..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/aggregator-cli-0.9.2.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/aggregator-pipeline-0.9.2.jar b/tools/aggregator-cli-0.9.2/lib/aggregator-pipeline-0.9.2.jar deleted file mode 100644 index b08c5cbd..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/aggregator-pipeline-0.9.2.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/aopalliance-1.0.jar b/tools/aggregator-cli-0.9.2/lib/aopalliance-1.0.jar deleted file mode 100644 index 578b1a0c..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/aopalliance-1.0.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/bcprov-jdk15on-1.53.jar b/tools/aggregator-cli-0.9.2/lib/bcprov-jdk15on-1.53.jar deleted file mode 100644 index c9fbafba..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/bcprov-jdk15on-1.53.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/commons-codec-1.10.jar b/tools/aggregator-cli-0.9.2/lib/commons-codec-1.10.jar deleted file mode 100644 index 1d7417c4..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/commons-codec-1.10.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/cryptacular-1.0.jar b/tools/aggregator-cli-0.9.2/lib/cryptacular-1.0.jar deleted file mode 100644 index 0b8abab6..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/cryptacular-1.0.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/guava-29.0-jre.jar b/tools/aggregator-cli-0.9.2/lib/guava-29.0-jre.jar deleted file mode 100644 index e1fc1791..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/guava-29.0-jre.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/httpclient-4.3.6.jar b/tools/aggregator-cli-0.9.2/lib/httpclient-4.3.6.jar deleted file mode 100644 index 091498c9..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/httpclient-4.3.6.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/httpclient-cache-4.3.6.jar b/tools/aggregator-cli-0.9.2/lib/httpclient-cache-4.3.6.jar deleted file mode 100644 index 16acbece..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/httpclient-cache-4.3.6.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/httpcore-4.3.3.jar b/tools/aggregator-cli-0.9.2/lib/httpcore-4.3.3.jar deleted file mode 100644 index a8747b0c..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/httpcore-4.3.3.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/java-support-7.2.0.jar b/tools/aggregator-cli-0.9.2/lib/java-support-7.2.0.jar deleted file mode 100644 index f4be76a1..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/java-support-7.2.0.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/jcl-over-slf4j-1.7.12.jar b/tools/aggregator-cli-0.9.2/lib/jcl-over-slf4j-1.7.12.jar deleted file mode 100644 index 64ec66f2..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/jcl-over-slf4j-1.7.12.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/jcommander-1.48.jar b/tools/aggregator-cli-0.9.2/lib/jcommander-1.48.jar deleted file mode 100644 index ad0a12c9..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/jcommander-1.48.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/joda-time-2.9.jar b/tools/aggregator-cli-0.9.2/lib/joda-time-2.9.jar deleted file mode 100644 index 340af06a..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/joda-time-2.9.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/jsr305-3.0.1.jar b/tools/aggregator-cli-0.9.2/lib/jsr305-3.0.1.jar deleted file mode 100644 index 021df892..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/jsr305-3.0.1.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/logback-classic-1.1.3.jar b/tools/aggregator-cli-0.9.2/lib/logback-classic-1.1.3.jar deleted file mode 100644 index c5ecdeb5..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/logback-classic-1.1.3.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/logback-core-1.1.3.jar b/tools/aggregator-cli-0.9.2/lib/logback-core-1.1.3.jar deleted file mode 100644 index c776e4a0..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/logback-core-1.1.3.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/slf4j-api-1.7.12.jar b/tools/aggregator-cli-0.9.2/lib/slf4j-api-1.7.12.jar deleted file mode 100644 index 51e2fad1..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/slf4j-api-1.7.12.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-aop-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.2/lib/spring-aop-4.2.3.RELEASE.jar deleted file mode 100644 index 99e8d0b0..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-aop-4.2.3.RELEASE.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-beans-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.2/lib/spring-beans-4.2.3.RELEASE.jar deleted file mode 100644 index 801c67b5..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-beans-4.2.3.RELEASE.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-context-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.2/lib/spring-context-4.2.3.RELEASE.jar deleted file mode 100644 index 3dd244e8..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-context-4.2.3.RELEASE.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-core-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.2/lib/spring-core-4.2.3.RELEASE.jar deleted file mode 100644 index c38bc9a3..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-core-4.2.3.RELEASE.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-expression-4.2.3.RELEASE.jar b/tools/aggregator-cli-0.9.2/lib/spring-expression-4.2.3.RELEASE.jar deleted file mode 100644 index 54baeb37..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-expression-4.2.3.RELEASE.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/spring-extensions-5.2.0.jar b/tools/aggregator-cli-0.9.2/lib/spring-extensions-5.2.0.jar deleted file mode 100644 index 9267fded..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/spring-extensions-5.2.0.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/stax-api-1.0-2.jar b/tools/aggregator-cli-0.9.2/lib/stax-api-1.0-2.jar deleted file mode 100644 index 015169dc..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/stax-api-1.0-2.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/stax2-api-3.1.4.jar b/tools/aggregator-cli-0.9.2/lib/stax2-api-3.1.4.jar deleted file mode 100644 index dded0369..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/stax2-api-3.1.4.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/woodstox-core-asl-4.4.1.jar b/tools/aggregator-cli-0.9.2/lib/woodstox-core-asl-4.4.1.jar deleted file mode 100644 index d8b4e8cf..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/woodstox-core-asl-4.4.1.jar and /dev/null differ diff --git a/tools/aggregator-cli-0.9.2/lib/xmlsec-2.0.5.jar b/tools/aggregator-cli-0.9.2/lib/xmlsec-2.0.5.jar deleted file mode 100644 index 9bc7db6c..00000000 Binary files a/tools/aggregator-cli-0.9.2/lib/xmlsec-2.0.5.jar and /dev/null differ diff --git a/tools/inc-mda/inc-mda-0.9.1.jar b/tools/inc-mda/inc-mda-0.9.1.jar deleted file mode 100644 index 2a5f3b8d..00000000 Binary files a/tools/inc-mda/inc-mda-0.9.1.jar and /dev/null differ diff --git a/tools/lib/jakarta.activation-2.0.1.jar b/tools/lib/jakarta.activation-2.0.1.jar new file mode 100644 index 00000000..521c7c49 Binary files /dev/null and b/tools/lib/jakarta.activation-2.0.1.jar differ diff --git a/tools/lib/jakarta.xml.bind-api-2.3.2.jar b/tools/lib/jakarta.xml.bind-api-2.3.2.jar deleted file mode 100644 index b16236d5..00000000 Binary files a/tools/lib/jakarta.xml.bind-api-2.3.2.jar and /dev/null differ diff --git a/tools/lib/jakarta.xml.bind-api-3.0.1.jar b/tools/lib/jakarta.xml.bind-api-3.0.1.jar new file mode 100644 index 00000000..f890cba5 Binary files /dev/null and b/tools/lib/jakarta.xml.bind-api-3.0.1.jar differ diff --git a/tools/lib/jaxb-core-3.0.1.jar b/tools/lib/jaxb-core-3.0.1.jar new file mode 100644 index 00000000..cf41ede9 Binary files /dev/null and b/tools/lib/jaxb-core-3.0.1.jar differ diff --git a/tools/lib/jaxb-runtime-2.3.2.jar b/tools/lib/jaxb-runtime-2.3.2.jar deleted file mode 100644 index 62f87196..00000000 Binary files a/tools/lib/jaxb-runtime-2.3.2.jar and /dev/null differ diff --git a/tools/lib/jaxb-runtime-3.0.2.jar b/tools/lib/jaxb-runtime-3.0.2.jar new file mode 100644 index 00000000..6f869c4a Binary files /dev/null and b/tools/lib/jaxb-runtime-3.0.2.jar differ diff --git a/tools/aggregator-cli-0.9.2/cpappend.bat b/tools/mda-distribution-0.10.0/cpappend.bat similarity index 96% rename from tools/aggregator-cli-0.9.2/cpappend.bat rename to tools/mda-distribution-0.10.0/cpappend.bat index bafe1398..5e7ef33f 100755 --- a/tools/aggregator-cli-0.9.2/cpappend.bat +++ b/tools/mda-distribution-0.10.0/cpappend.bat @@ -1,17 +1,17 @@ -rem --------------------------------------------------------------------------- -rem Append to CLASSPATH -rem --------------------------------------------------------------------------- - -rem Process the first argument -if ""%1"" == """" goto end -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 -shift - -rem Process the remaining arguments -:setArgs -if ""%1"" == """" goto doneSetArgs -set LOCALCLASSPATH=%LOCALCLASSPATH% %1 -shift -goto setArgs -:doneSetArgs -:end +rem --------------------------------------------------------------------------- +rem Append to CLASSPATH +rem --------------------------------------------------------------------------- + +rem Process the first argument +if ""%1"" == """" goto end +set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 +shift + +rem Process the remaining arguments +:setArgs +if ""%1"" == """" goto doneSetArgs +set LOCALCLASSPATH=%LOCALCLASSPATH% %1 +shift +goto setArgs +:doneSetArgs +:end diff --git a/tools/aggregator-cli-0.9.2/doc/LICENSE.txt b/tools/mda-distribution-0.10.0/doc/LICENSE.txt similarity index 100% rename from tools/aggregator-cli-0.9.2/doc/LICENSE.txt rename to tools/mda-distribution-0.10.0/doc/LICENSE.txt diff --git a/tools/mda-distribution-0.10.0/doc/wiki/README.md b/tools/mda-distribution-0.10.0/doc/wiki/README.md new file mode 100644 index 00000000..0ad9343c --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/README.md @@ -0,0 +1,31 @@ +# Wiki Configuration Examples + +This directory contains copies of the [configuration examples][wiki:examples] +provided on the wiki. The intention is to make it easier to keep them up to date +with new releases by having test data available alongside them. + +[wiki:examples]: https://wiki.shibboleth.net/confluence/display/MA1/Configuration+Examples + +- [Aggregate and Sign](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1501823071/Aggregate+and+Sign) + + `.../mda.sh aggregate-and-sign.xml main` + +- [Filter Aggregate](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1501823090/Filter+Aggregate) + + `.../mda.sh filter-aggregate.xml main` + +- [Aggregate and Republish](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1501823098/Aggregate+and+Republish) + + `.../mda.sh aggregate-and-republish.xml main` + +- [Sign Using PKCS#11 Token](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1502216280/Sign+using+PKCS%2311+token) + + `.../mda.sh sign-using-token.xml main` + +- [Per-entity Output](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1502216310/Per-entity+Output) + + `.../mda.sh per-entity.xml main` + +- [Generate Discovery Feed](https://shibboleth.atlassian.net/wiki/spaces/MA1/pages/1552614062/Generate+Discovery+Feed): + + `.../mda.sh discofeed.xml main` diff --git a/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-republish.xml b/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-republish.xml new file mode 100644 index 00000000..b2627345 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-republish.xml @@ -0,0 +1,441 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{T(net.shibboleth.metadata.ErrorStatus)} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-sign.xml b/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-sign.xml new file mode 100644 index 00000000..68eafdd3 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/aggregate-and-sign.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/discofeed.xml b/tools/mda-distribution-0.10.0/doc/wiki/discofeed.xml new file mode 100644 index 00000000..5c8c4dc5 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/discofeed.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://idp.shibboleth.net/idp/shibboleth + https://example.com/idp + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/filter-aggregate.xml b/tools/mda-distribution-0.10.0/doc/wiki/filter-aggregate.xml new file mode 100644 index 00000000..d6e6cf79 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/filter-aggregate.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{T(net.shibboleth.metadata.ErrorStatus)} + + + + + + + + + + #{T(net.shibboleth.metadata.ErrorStatus)} + + + + + + + + + https://idp.example.com/idp/shibboleth + https://issues.example.com/shibboleth + https://wiki.example.com/shibboleth + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/make-keys.sh b/tools/mda-distribution-0.10.0/doc/wiki/make-keys.sh new file mode 100755 index 00000000..25e439b1 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/make-keys.sh @@ -0,0 +1,16 @@ +#!/usr/bin/sh + +KEYFILE=path/to/secrets/private-key.pem +CERTFILE=path/to/secrets/self-signed.pem +P12FILE=path/to/secrets/self-signed.p12 + +# Generate an RSA private key +openssl genrsa >$KEYFILE +chmod 600 $KEYFILE + +# Generate a self-signed certificate based on that key +openssl req -key $KEYFILE -new -x509 -days 365 -out $CERTFILE \ + -subj "/CN=test-self-signed" + +# Create PKCS12 keystore from private key and public certificate. +openssl pkcs12 -export -name key10 -passout pass:password -in $CERTFILE -inkey $KEYFILE -out $P12FILE diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/aggregate.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/aggregate.xml new file mode 100644 index 00000000..be311555 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/aggregate.xml @@ -0,0 +1,458 @@ + + + + + + + + iay.org.uk + + + + http://ukfederation.org.uk/doc/mdrps-20130902 + + + + http://refeds.org/category/research-and-scholarship + + + + + + + Ian A. Young + This is the identity provider for the iay.org.uk domain. + https://idp2.iay.org.uk/images/heads_80x80.jpg + https://idp2.iay.org.uk/images/heads_100x43.jpg + https://idp2.iay.org.uk/images/heads_240x104.jpg + + + 217.155.173.104/29 + iay.org.uk + geo:55.9328,-3.17905 + + iay.org.uk + + + + + + MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+ + MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG + CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT + 8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG + A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK + CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3 + DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl + FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk + L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ + QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0 + lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm + Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI + hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe + Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ + jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M + HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr + YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P + YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY= + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + + + iay.org.uk + + + + + + MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+ + MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG + CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT + 8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG + A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK + CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3 + DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl + FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk + L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ + QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0 + lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm + Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI + hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe + Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ + jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M + HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr + YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P + YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY= + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + Ian A. Young + Ian A. Young + http://iay.org.uk/ + + + Ian + Young + mailto:ukfed+fc2ee77e@iay.org.uk + + + Ian + Young + mailto:ukfed+fc2ee77e@iay.org.uk + + + + + + + + shibboleth.net + + + + + + + + + + + + + http://ukfederation.org.uk/doc/mdrps-20130902 + + + + + shibboleth.net + + Shibboleth.net + An identity provider hosted and used by the + developers of Shibboleth. + https://shibboleth.net/images/gryphon_64x82.png + + + + + + + MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB + BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5 + MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l + dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA + M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq + 5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5 + /0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599 + pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/ + LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3 + y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw + czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU + 3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj + 3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH + egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5 + +A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7 + iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce + Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx + BXD36HfGBXk= + + + + + + + + + + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + Jisc Services Limited + Shibboleth.net + http://www.shibboleth.net/ + + + Shibboleth.Net Technical Support + mailto:contact@shibboleth.net + + + Scott + Cantor + mailto:cantor.2@osu.edu + + + Ian + Young + mailto:ukfed@iay.org.uk + + + + + + + + + + + + + + + Shibboleth.net Issue Tracking + The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project. Unauthenticated users may view submitted issues. Authenticated users may submit new issues and comment on existing ones. + https://wiki.shibboleth.net/confluence/display/DEV/Infrastructure+Information + https://shibboleth.net/images/gryphon_64x82.png + + + + + + +MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ +kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD +VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw +MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB +GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA ++hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP +f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb +ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4 +y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP +3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID +AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN +AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV +v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+ +TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1 +1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1 +umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU +PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA= + + + + + + + + + + + + Shibboleth.net Issue Tracking + The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project. Unauthenticated users may view submitted issues. Authenticated users may submit new issues and comment on existing ones. + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + + + + + + + + + + + Shibboleth.net Wiki + The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing documentation. Authenticated users may create new documentation pages and edit existing ones. + https://wiki.shibboleth.net/confluence/display/DEV/Infrastructure+Information + https://shibboleth.net/images/gryphon_64x82.png + + + + + + +MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ +kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD +VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw +NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW +CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n +r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s +iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ +SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ +KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF +m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj +ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF +AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ +tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd +rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE +3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y +L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R +9h5hlBTGD3PULSFmCdkgxtwIyd855Q== + + + + + + + + + + + + Shibboleth.net Wiki + The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing documentation. Authenticated users may create new documentation pages and edit existing ones. + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + + + + + + + http://refeds.org/category/research-and-scholarship + + + https://refeds.org/sirtfi + + + + + + + osu.edu + + Ohio State University + https://webauth.service.ohio-state.edu/info.html + https://it.osu.edu/sites/default/files/files-1477502394/disclosurepolicy.pdf + https://webauth.service.ohio-state.edu/images/osu_mdui.png + + + + + + +MIIEUDCCArigAwIBAgIJAOTP/syONHwnMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV +BAMMHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xOTAyMjIxOTE3 +MjJaFw00NjA3MTAxOTE3MjJaMCkxJzAlBgNVBAMMHndlYmF1dGguc2VydmljZS5v +aGlvLXN0YXRlLmVkdTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJle +1C2GVPJkD+fXHBxGMZSLVFsEClJNFbI2Rp5feo8QNvV5CYIMU+bNqovkMZhONAbz +3v63v/HNNr3tFk6ZBWk7fQ+VZE7NyHGrpKn1XiWbFMBokEsMXah3tDHq5clxCWHi +dg8J9knnLt71h2j7SvSowxF8TwEmIGQmymNs1TeW2kVxKZWChk+UzRk3VNMPxoUz +lEdAiqBSl/J3E+W1lCzYxs/r9cTTeQwAJkwg/gjewCTcNlXGtt9ykf4Csja2NFtO +hh7bys3VzAI0nsHFTxQq3rxbbmeCmLdLGvu83h2iI0JrT6HYmo0ksXVqTXIOPS+D +ZJmCYLL4PKJQb6fAcQhE4NgZMEEJdtToe8mt34/UPGutRz0ja/fgV6ec3AJq9wQF +jQ20iPpDh/aVuLpSQYmEhuMQOXvBI8ILv/wKSPQ2A63FSr4adoNFlBCsOFoTW9uu +y7Kxc8Qo+ZzEF39WWBnc3UcBSxk9Z9zsCFCAbfBt+SVrbNUA4L4lU/8x9DpRpwID +AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy +YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUML3nKeprDqx0PFVahBwqvu2s5y4w +HwYDVR0jBBgwFoAUML3nKeprDqx0PFVahBwqvu2s5y4wDQYJKoZIhvcNAQELBQAD +ggGBADSfQwfmSPjrXGdWsCqngcEmN1ksnSCcNm8qdp+YO0luZO0MiJsM0cIvka1e +/9MeP7VMbeBTOpSlr1RzN6h0bFWo9vwLbIuYsLc63Vt4B1R7DzUMQwWc7LekfV/A +8IIdendOvCLpxvrm3dj32VgA5jNlJ+M7fDzFh5vHouLEAD45F/qn50N1XyZYX86C +zLpL7rCfmnMGrzAYBUgj9d6CU8xkf0XoiCsyMsuku0ZNFEzUCKZKHvle9HCYmwA1 +/FtgnWK+vhjsnEH4dApxP2D4YbP3mGSCpkOKBuNFbJd8sjhIpGCTCwxp8jNl61xE +S6PJeJfcTU8ztIsGhug80jySah6mEmIyQ47YbG25Lt5AuTAZDTPf84QpD6qdMCvJ +KjK/sp1LPbN0WZBdzQup9e8WhdMt2sN6UsxM7+WNlJLZ+Fn3xFHkiWvgXp53jiT2 +KITPlARNryCA9e7et3E05ZxtCocCh+y7eEGV7/+g4CjhqniVsshTcVzrKicYN6oC +O8tLIQ== + + + + + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + IT Service Desk + mailto:8help@osu.edu + + + Authentication Support + mailto:webauth-admin@lists.service.ohio-state.edu + + + Authentication Support + mailto:webauth-admin@lists.service.ohio-state.edu + + + Security Response Team + mailto:security@osu.edu + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity1.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity1.xml new file mode 100644 index 00000000..6f9d411f --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity1.xml @@ -0,0 +1,134 @@ + + + + + + iay.org.uk + + + + http://ukfederation.org.uk/doc/mdrps-20130902 + + + + http://refeds.org/category/research-and-scholarship + + + + + + + Ian A. Young + This is the identity provider for the iay.org.uk domain. + https://idp2.iay.org.uk/images/heads_80x80.jpg + https://idp2.iay.org.uk/images/heads_100x43.jpg + https://idp2.iay.org.uk/images/heads_240x104.jpg + + + 217.155.173.104/29 + iay.org.uk + geo:55.9328,-3.17905 + + iay.org.uk + + + + + + MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+ + MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG + CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT + 8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG + A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK + CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3 + DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl + FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk + L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ + QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0 + lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm + Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI + hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe + Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ + jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M + HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr + YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P + YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY= + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + + + iay.org.uk + + + + + + MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+ + MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG + CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT + 8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG + A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK + CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3 + DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl + FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk + L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ + QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0 + lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm + Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI + hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe + Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ + jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M + HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr + YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P + YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY= + + + + + + + urn:mace:shibboleth:1.0:nameIdentifier + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + Ian A. Young + Ian A. Young + http://iay.org.uk/ + + + Ian + Young + mailto:ukfed+fc2ee77e@iay.org.uk + + + Ian + Young + mailto:ukfed+fc2ee77e@iay.org.uk + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity2.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity2.xml new file mode 100644 index 00000000..84d80b8f --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity2.xml @@ -0,0 +1,98 @@ + + + + + shibboleth.net + + + + + + + + + + + http://ukfederation.org.uk/doc/mdrps-20130902 + + + + + shibboleth.net + + Shibboleth.net + An identity provider hosted and used by the + developers of Shibboleth. + https://shibboleth.net/images/gryphon_64x82.png + + + + + + + MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB + BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5 + MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l + dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA + M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq + 5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5 + /0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599 + pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/ + LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3 + y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw + czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU + 3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj + 3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH + egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5 + +A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7 + iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce + Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx + BXD36HfGBXk= + + + + + + + + + + urn:oasis:names:tc:SAML:2.0:nameid-format:transient + + + + + + Jisc Services Limited + Shibboleth.net + http://www.shibboleth.net/ + + + Shibboleth.Net Technical Support + mailto:contact@shibboleth.net + + + Scott + Cantor + mailto:cantor.2@osu.edu + + + Ian + Young + mailto:ukfed@iay.org.uk + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity3.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity3.xml new file mode 100644 index 00000000..757300c9 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity3.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + Shibboleth.net Issue Tracking + The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project. Unauthenticated users may view submitted issues. Authenticated users may submit new issues and comment on existing ones. + https://wiki.shibboleth.net/confluence/display/DEV/Infrastructure+Information + https://shibboleth.net/images/gryphon_64x82.png + + + + + + + MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ + kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD + VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw + MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB + GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB + IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA + +hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP + f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb + ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4 + y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP + 3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID + AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN + AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV + v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+ + TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1 + 1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1 + umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU + PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA= + + + + + + + + + + + + Shibboleth.net Issue Tracking + The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project. Unauthenticated users may view submitted issues. Authenticated users may submit new issues and comment on existing ones. + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity4.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity4.xml new file mode 100644 index 00000000..4a9917f2 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + Shibboleth.net Wiki + The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing documentation. Authenticated users may create new documentation pages and edit existing ones. + https://wiki.shibboleth.net/confluence/display/DEV/Infrastructure+Information + https://shibboleth.net/images/gryphon_64x82.png + + + + + + + MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ + kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD + VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw + NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW + CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G + CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n + r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s + iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ + SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ + KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF + m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj + ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF + AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ + tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd + rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE + 3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y + L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R + 9h5hlBTGD3PULSFmCdkgxtwIyd855Q== + + + + + + + + + + + + Shibboleth.net Wiki + The wiki hosting the documentation for Shibboleth. Unauthenticated user may view the existing documentation. Authenticated users may create new documentation pages and edit existing ones. + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + + Shibboleth Contact + mailto:contact@shibboleth.net + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity5.xml b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity5.xml new file mode 100644 index 00000000..d9be629a --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/entities/entity5.xml @@ -0,0 +1,96 @@ + + + + + + + http://refeds.org/category/research-and-scholarship + + + https://refeds.org/sirtfi + + + + + + + osu.edu + + Ohio State University + https://webauth.service.ohio-state.edu/info.html + https://it.osu.edu/sites/default/files/files-1477502394/disclosurepolicy.pdf + https://webauth.service.ohio-state.edu/images/osu_mdui.png + + + + + + +MIIEUDCCArigAwIBAgIJAOTP/syONHwnMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV +BAMMHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xOTAyMjIxOTE3 +MjJaFw00NjA3MTAxOTE3MjJaMCkxJzAlBgNVBAMMHndlYmF1dGguc2VydmljZS5v +aGlvLXN0YXRlLmVkdTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAJle +1C2GVPJkD+fXHBxGMZSLVFsEClJNFbI2Rp5feo8QNvV5CYIMU+bNqovkMZhONAbz +3v63v/HNNr3tFk6ZBWk7fQ+VZE7NyHGrpKn1XiWbFMBokEsMXah3tDHq5clxCWHi +dg8J9knnLt71h2j7SvSowxF8TwEmIGQmymNs1TeW2kVxKZWChk+UzRk3VNMPxoUz +lEdAiqBSl/J3E+W1lCzYxs/r9cTTeQwAJkwg/gjewCTcNlXGtt9ykf4Csja2NFtO +hh7bys3VzAI0nsHFTxQq3rxbbmeCmLdLGvu83h2iI0JrT6HYmo0ksXVqTXIOPS+D +ZJmCYLL4PKJQb6fAcQhE4NgZMEEJdtToe8mt34/UPGutRz0ja/fgV6ec3AJq9wQF +jQ20iPpDh/aVuLpSQYmEhuMQOXvBI8ILv/wKSPQ2A63FSr4adoNFlBCsOFoTW9uu +y7Kxc8Qo+ZzEF39WWBnc3UcBSxk9Z9zsCFCAbfBt+SVrbNUA4L4lU/8x9DpRpwID +AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy +YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUML3nKeprDqx0PFVahBwqvu2s5y4w +HwYDVR0jBBgwFoAUML3nKeprDqx0PFVahBwqvu2s5y4wDQYJKoZIhvcNAQELBQAD +ggGBADSfQwfmSPjrXGdWsCqngcEmN1ksnSCcNm8qdp+YO0luZO0MiJsM0cIvka1e +/9MeP7VMbeBTOpSlr1RzN6h0bFWo9vwLbIuYsLc63Vt4B1R7DzUMQwWc7LekfV/A +8IIdendOvCLpxvrm3dj32VgA5jNlJ+M7fDzFh5vHouLEAD45F/qn50N1XyZYX86C +zLpL7rCfmnMGrzAYBUgj9d6CU8xkf0XoiCsyMsuku0ZNFEzUCKZKHvle9HCYmwA1 +/FtgnWK+vhjsnEH4dApxP2D4YbP3mGSCpkOKBuNFbJd8sjhIpGCTCwxp8jNl61xE +S6PJeJfcTU8ztIsGhug80jySah6mEmIyQ47YbG25Lt5AuTAZDTPf84QpD6qdMCvJ +KjK/sp1LPbN0WZBdzQup9e8WhdMt2sN6UsxM7+WNlJLZ+Fn3xFHkiWvgXp53jiT2 +KITPlARNryCA9e7et3E05ZxtCocCh+y7eEGV7/+g4CjhqniVsshTcVzrKicYN6oC +O8tLIQ== + + + + + + + + + + + + The Ohio State University + Ohio State University + http://www.osu.edu/ + + + IT Service Desk + mailto:8help@osu.edu + + + Authentication Support + mailto:webauth-admin@lists.service.ohio-state.edu + + + Authentication Support + mailto:webauth-admin@lists.service.ohio-state.edu + + + Security Response Team + mailto:security@osu.edu + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/inc-md-cert-mdq.pem b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/inc-md-cert-mdq.pem new file mode 100644 index 00000000..178dcf85 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/inc-md-cert-mdq.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEvjCCAyagAwIBAgIJANpi9/mkU/zoMA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJNSTESMBAGA1UEBwwJQW5uIEFyYm9yMRYwFAYDVQQK +DA1JbnRlcm5ldDIuZWR1MREwDwYDVQQLDAhJbkNvbW1vbjEZMBcGA1UEAwwQbWRx +LmluY29tbW9uLm9yZzAeFw0xODExMTMxNDI5NDNaFw0zODExMTAxNDI5NDNaMHQx +CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNSTESMBAGA1UEBwwJQW5uIEFyYm9yMRYw +FAYDVQQKDA1JbnRlcm5ldDIuZWR1MREwDwYDVQQLDAhJbkNvbW1vbjEZMBcGA1UE +AwwQbWRxLmluY29tbW9uLm9yZzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC +ggGBAJ0+fUTzYVSP6ZOutOEhNdp3WPCPOYqnB4sQFz7IeGbFL1o0lZjx5Izm4Yho +4wNDd0h486iSkHxNf5dDhCqgz7ZRSmbusOl98SYn70PrUQj/Nzs3w47dPg9Tpb/x +y44PvNLS/rE56hPgCz/fbHoTTiJt5eosysa1ZebQ3LEyW3jGm+LGtLbdIfkynKVQ +vpp1FVeCamzdeB3ZRICAvqTYQKE1JQDGlWrEsSW0VVEGNjfbzMzr/g4l8JRdMabQ +Jig8tj3UIXnu7A2CKSMJSy3WZ3HX+85oHEbL+EV4PtpQz765c69tUIdNTJax9jQ2 +1c3wL0K27HE8jSRlrXImD50R3dXQBKH+iiynBWxRPdyMBa1YfK+zZEWPbLHshSTc +9hkylQv3awmPR/+Plz5AtTpe5yss/Ifyp01wz1jt42R+6jDE+WbUjp5XDBCAjGEE +0FPaYtxjZLkmNl367bdTN12OIn/ixPNH+Z/S/4skdBB9Gc4lb2fEBywJQY0OYNOd +WOxmPwIDAQABo1MwUTAdBgNVHQ4EFgQUMHZuwMaYSJM5mlu3Wc4Ts5xq4/swHwYD +VR0jBBgwFoAUMHZuwMaYSJM5mlu3Wc4Ts5xq4/swDwYDVR0TAQH/BAUwAwEB/zAN +BgkqhkiG9w0BAQsFAAOCAYEAMr4wfLrSoPTzfpXtvL+2vrKBJNnRfuJpOYTbPKUc +DOP2QfzRlczi7suYJvd5rLiRonq8rjyPUyM8gvTfbTps+JhJ6S9mS6dTBxOV1qPZ +3Ab+XKmq8LUtguGRabKgJgmJH0+inR/wVoal7EVHcWXfij9AT8DZOXW88shc6grh +jUaFZBu/2+q8c8ee0e4ip8B+CVEnCwDKI0d+nTcSmPvAE34CNa33F+QGpXawv5yv +VvIpSaLAeFQhc/jKcnNHfy+Zi7JmSnKZiMvQCbWANQmDjHg7pGmBW9nyQcm6P2/B +0AVcEj1YTpAR8Mbh1pUdIhoB+chaNnFEIZsXeRsdbbAFpxodInlJ7WekfuvSQ6sU +EXpoyBGOeuuTmR1va8k3QeL8Wc4yNu/g5LwjmtvPrh2jBF8xujc4J6VzP8K2BjA4 +xk4LnXgjHOT93dBAJhVYJkykDHwyvHUvsBHoP6lfjrt5P8zunK2mdP/AZKik+Rdt +1GGlErV2AyWShTOaDLW6NxdP +-----END CERTIFICATE----- diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/pkcs11-softhsm.cfg b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/pkcs11-softhsm.cfg new file mode 100644 index 00000000..d569459f --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/pkcs11-softhsm.cfg @@ -0,0 +1,3 @@ +# PKCS#11 provider configuration for softhsm running under Amazon Linux +name = softhsm +library = /usr/lib64/pkcs11/libsofthsm2.so diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/ukfederation-2014.pem b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/ukfederation-2014.pem new file mode 100644 index 00000000..bee705cd --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/input/ukfederation-2014.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDxzCCAq+gAwIBAgIJAOwuoY8tsvYGMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV +BAYTAkdCMUMwQQYDVQQKDDpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9u +IGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQDDB1VSyBGZWRlcmF0 +aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0xNDA4MjYxMjIwMjhaFw0zNzEyMzExMjIw +MjhaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKDDpVSyBBY2Nlc3MgTWFuYWdlbWVu +dCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQD +DB1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAOqtfMvCmBuQudC4/jZFPYkHDNHFyp1FA3KJihIUXppF +vrecrO2wG5CpyqB1mZ+MlKf4jKcTMGBIXC2klD+FyrEdJMBhO6vRmJnNphg3uNZM +ks0NqIaZmtgc7e8435nMhqLHV95UK2oCLcT4gZrTaXa2vt9kukTOijB0KqDIfEG5 +369EHXPItApAEeMlHebbWndl5n2I16nya/LeaoiU9qJ6sVz4xd1UtUesewrmYVKg +PA2JYEpovmnr13sTnGssai5Db/FkrE2NJ4Q4drbPYcwincUo/UXzrtuPclr+l3JE +gjtvDzPrBxxvK0S/gARrbKz5tk4LDLkYsj4PKlwVS+UCAwEAAaNQME4wHQYDVR0O +BBYEFE9HhBuMxrzBYOj1Kj/3gtzAgtUEMB8GA1UdIwQYMBaAFE9HhBuMxrzBYOj1 +Kj/3gtzAgtUEMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBALJkjT3K +QL3w3xNfVe27nEOY44K2AZiu4IhqmRSslcyMnhnxrovEhLL3ieKFXQ+QFIkzVdR5 +BcO3NrSIz5V6b+mHtr5IjqLFHzOzzjw/3i8LddGOsApJiav+JrU1CGJXCU4cwYDN +hAyfuAlrrEEL2lWMU1L1ZTzHsG1yWTfukfuvTftY5BwZ/dgANgIWwLDhvL6CAQZ3 +g5XteFPyChU0Z7b3XAHdVNHDa2VzWSsSUDtSQZ9DyTuqSjZH1q2/qtdMcrbJpdMB +cndOf1pZRLzb6a+akIYi//1qO48HpB4wouH9gS3ZER+rNBhVWu301UYxoVI7o8mG +Yq7dENJce7lO9yE= +-----END CERTIFICATE----- diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/output/.gitkeep b/tools/mda-distribution-0.10.0/doc/wiki/path/to/output/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-assertion-2.0.xsd b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-assertion-2.0.xsd new file mode 100644 index 00000000..a1ef536c --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-assertion-2.0.xsd @@ -0,0 +1,283 @@ + + + + + + + Document identifier: saml-schema-assertion-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V1.0 (November, 2002): + Initial Standard Schema. + V1.1 (September, 2003): + Updates within the same V1.0 namespace. + V2.0 (March, 2005): + New assertion schema for SAML V2.0 namespace. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-metadata-2.0.xsd b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-metadata-2.0.xsd new file mode 100644 index 00000000..f052721c --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/saml-schema-metadata-2.0.xsd @@ -0,0 +1,337 @@ + + + + + + + + + Document identifier: saml-schema-metadata-2.0 + Location: http://docs.oasis-open.org/security/saml/v2.0/ + Revision history: + V2.0 (March, 2005): + Schema for SAML metadata, first published in SAML 2.0. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xenc-schema.xsd b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xenc-schema.xsd new file mode 100644 index 00000000..82f7be4b --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xenc-schema.xsd @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xml.xsd b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xml.xsd new file mode 100644 index 00000000..f10e6abb --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xml.xsd @@ -0,0 +1,80 @@ + + + + + + See http://www.w3.org/XML/1998/namespace.html and + http://www.w3.org/TR/REC-xml for information about this namespace. + + + + + This schema defines attributes and an attribute group + suitable for use by + schemas wishing to allow xml:base, xml:lang or xml:space attributes + on elements they define. + + To enable this, such a schema must import this schema + for the XML namespace, e.g. as follows: + <schema . . .> + . . . + <import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/03/xml.xsd"/> + + Subsequently, qualified reference to any of the attributes + or the group defined below will have the desired effect, e.g. + + <type . . .> + . . . + <attributeGroup ref="xml:specialAttrs"/> + + will define a type which will schema-validate an instance + element with any of those attributes + + + + In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + http://www.w3.org/2001/03/xml.xsd. + At the date of issue it can also be found at + http://www.w3.org/2001/xml.xsd. + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML Schema + itself. In other words, if the XML Schema namespace changes, the version + of this document at + http://www.w3.org/2001/xml.xsd will change + accordingly; the version at + http://www.w3.org/2001/03/xml.xsd will not change. + + + + + + In due course, we should install the relevant ISO 2- and 3-letter + codes as the enumerated possible values . . . + + + + + + + + + + + + + + + See http://www.w3.org/TR/xmlbase/ for + information about this attribute. + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xmldsig-core-schema.xsd b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xmldsig-core-schema.xsd new file mode 100644 index 00000000..ebcd6a42 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/path/to/schema/xmldsig-core-schema.xsd @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/per-entity.xml b/tools/mda-distribution-0.10.0/doc/wiki/per-entity.xml new file mode 100644 index 00000000..b1e218ad --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/per-entity.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/doc/wiki/run-all-examples.sh b/tools/mda-distribution-0.10.0/doc/wiki/run-all-examples.sh new file mode 100755 index 00000000..ee88515c --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/run-all-examples.sh @@ -0,0 +1,21 @@ +#!/usr/bin/sh + +set -e + +./make-keys.sh + +rm -rf softhsm/* +source ./setup-softhsm.sh + +echo Aggregate and Sign... +mda.sh aggregate-and-sign.xml main +echo Filter Aggregate... +mda.sh filter-aggregate.xml main +echo Aggregate and Republish... +mda.sh aggregate-and-republish.xml main +echo Sign Using Token... +mda.sh sign-using-token.xml main +echo Per-entity metadata... +mda.sh per-entity.xml main +echo Discovery feed... +mda.sh discofeed.xml main diff --git a/tools/mda-distribution-0.10.0/doc/wiki/setup-softhsm.sh b/tools/mda-distribution-0.10.0/doc/wiki/setup-softhsm.sh new file mode 100755 index 00000000..19e59fbe --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/setup-softhsm.sh @@ -0,0 +1,22 @@ +#!/usr/bin/sh + +# Clear any previous softhsm setup +rm -rf softhsm +mkdir -p softhsm/tokens + +# Create configuration file +export SOFTHSM2_CONF=$PWD/softhsm/softhsm2.conf +echo "directories.tokendir = $PWD/softhsm/tokens" >$SOFTHSM2_CONF + +# Initialise the token +softhsm2-util --init-token --slot 0 --label "test" \ + --so-pin 1234 \ + --pin 12341234 + +# Load the credential +keytool -importkeystore --addprovider SunPKCS11 -providerarg path/to/input/pkcs11-softhsm.cfg \ + -srcstoretype pkcs12 -srckeystore path/to/secrets/self-signed.p12 -srcstorepass password \ + -deststoretype PKCS11 -destkeystore NONE -deststorepass 12341234 + +keytool -list --addprovider SunPKCS11 -providerarg path/to/input/pkcs11-softhsm.cfg \ + -storetype PKCS11 -keystore NONE -storepass 12341234 diff --git a/tools/mda-distribution-0.10.0/doc/wiki/sign-using-token.xml b/tools/mda-distribution-0.10.0/doc/wiki/sign-using-token.xml new file mode 100644 index 00000000..2c0f9095 --- /dev/null +++ b/tools/mda-distribution-0.10.0/doc/wiki/sign-using-token.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/mda-distribution-0.10.0/lib/bcpkix-jdk18on-1.77.jar b/tools/mda-distribution-0.10.0/lib/bcpkix-jdk18on-1.77.jar new file mode 100644 index 00000000..e8b6021a Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/bcpkix-jdk18on-1.77.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/bcprov-jdk18on-1.77.jar b/tools/mda-distribution-0.10.0/lib/bcprov-jdk18on-1.77.jar new file mode 100644 index 00000000..651d2fba Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/bcprov-jdk18on-1.77.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/bcutil-jdk18on-1.77.jar b/tools/mda-distribution-0.10.0/lib/bcutil-jdk18on-1.77.jar new file mode 100644 index 00000000..4c154e27 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/bcutil-jdk18on-1.77.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/checker-qual-3.41.0.jar b/tools/mda-distribution-0.10.0/lib/checker-qual-3.41.0.jar new file mode 100644 index 00000000..17a85a13 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/checker-qual-3.41.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/commons-codec-1.16.1.jar b/tools/mda-distribution-0.10.0/lib/commons-codec-1.16.1.jar new file mode 100644 index 00000000..f8966497 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/commons-codec-1.16.1.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/cryptacular-1.2.6.jar b/tools/mda-distribution-0.10.0/lib/cryptacular-1.2.6.jar new file mode 100644 index 00000000..2a30d708 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/cryptacular-1.2.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/error_prone_annotations-2.23.0.jar b/tools/mda-distribution-0.10.0/lib/error_prone_annotations-2.23.0.jar new file mode 100644 index 00000000..c0f20d8a Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/error_prone_annotations-2.23.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/failureaccess-1.0.2.jar b/tools/mda-distribution-0.10.0/lib/failureaccess-1.0.2.jar new file mode 100644 index 00000000..d73ab80b Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/failureaccess-1.0.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/guava-33.0.0-jre.jar b/tools/mda-distribution-0.10.0/lib/guava-33.0.0-jre.jar new file mode 100644 index 00000000..e42ef633 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/guava-33.0.0-jre.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/httpclient5-5.3.1.jar b/tools/mda-distribution-0.10.0/lib/httpclient5-5.3.1.jar new file mode 100644 index 00000000..1cf795c4 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/httpclient5-5.3.1.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/httpclient5-cache-5.3.1.jar b/tools/mda-distribution-0.10.0/lib/httpclient5-cache-5.3.1.jar new file mode 100644 index 00000000..5df65899 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/httpclient5-cache-5.3.1.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/httpcore5-5.2.4.jar b/tools/mda-distribution-0.10.0/lib/httpcore5-5.2.4.jar new file mode 100644 index 00000000..da9c6e5f Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/httpcore5-5.2.4.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/httpcore5-h2-5.2.4.jar b/tools/mda-distribution-0.10.0/lib/httpcore5-h2-5.2.4.jar new file mode 100644 index 00000000..5b598dd0 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/httpcore5-h2-5.2.4.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/j2objc-annotations-2.8.jar b/tools/mda-distribution-0.10.0/lib/j2objc-annotations-2.8.jar new file mode 100644 index 00000000..3595c4f9 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/j2objc-annotations-2.8.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/jakarta.json-2.0.1.jar b/tools/mda-distribution-0.10.0/lib/jakarta.json-2.0.1.jar new file mode 100644 index 00000000..e6d094a3 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/jakarta.json-2.0.1.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/jcommander-1.81.jar b/tools/mda-distribution-0.10.0/lib/jcommander-1.81.jar new file mode 100644 index 00000000..699c543e Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/jcommander-1.81.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/jsr305-3.0.2.jar b/tools/mda-distribution-0.10.0/lib/jsr305-3.0.2.jar new file mode 100644 index 00000000..59222d9c Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/jsr305-3.0.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/tools/mda-distribution-0.10.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar new file mode 100644 index 00000000..45832c05 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/logback-classic-1.5.3.jar b/tools/mda-distribution-0.10.0/lib/logback-classic-1.5.3.jar new file mode 100644 index 00000000..9bfbe41d Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/logback-classic-1.5.3.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/logback-core-1.5.3.jar b/tools/mda-distribution-0.10.0/lib/logback-core-1.5.3.jar new file mode 100644 index 00000000..3c82e610 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/logback-core-1.5.3.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/mda-cli-0.10.0.jar b/tools/mda-distribution-0.10.0/lib/mda-cli-0.10.0.jar new file mode 100644 index 00000000..f5bb18d8 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/mda-cli-0.10.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/mda-framework-0.10.0.jar b/tools/mda-distribution-0.10.0/lib/mda-framework-0.10.0.jar new file mode 100644 index 00000000..a7d38482 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/mda-framework-0.10.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-0.10.0.jar b/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-0.10.0.jar new file mode 100644 index 00000000..a3df0063 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-0.10.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-legacy-0.10.0.jar b/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-legacy-0.10.0.jar new file mode 100644 index 00000000..1b6fe85b Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/mda-keylists-rsa-legacy-0.10.0.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/micrometer-commons-1.12.5.jar b/tools/mda-distribution-0.10.0/lib/micrometer-commons-1.12.5.jar new file mode 100644 index 00000000..27a96a91 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/micrometer-commons-1.12.5.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/micrometer-observation-1.12.5.jar b/tools/mda-distribution-0.10.0/lib/micrometer-observation-1.12.5.jar new file mode 100644 index 00000000..c6deecb7 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/micrometer-observation-1.12.5.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-networking-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-networking-9.1.2.jar new file mode 100644 index 00000000..e48ea98a Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-networking-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-networking-spring-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-networking-spring-9.1.2.jar new file mode 100644 index 00000000..588d8ab5 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-networking-spring-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-security-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-security-9.1.2.jar new file mode 100644 index 00000000..1a07e28a Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-security-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-security-spring-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-security-spring-9.1.2.jar new file mode 100644 index 00000000..b8bd72b0 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-security-spring-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-spring-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-spring-9.1.2.jar new file mode 100644 index 00000000..45efad9a Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-spring-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/shib-support-9.1.2.jar b/tools/mda-distribution-0.10.0/lib/shib-support-9.1.2.jar new file mode 100644 index 00000000..3063efc8 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/shib-support-9.1.2.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/slf4j-api-2.0.12.jar b/tools/mda-distribution-0.10.0/lib/slf4j-api-2.0.12.jar new file mode 100644 index 00000000..bfa1de39 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/slf4j-api-2.0.12.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-aop-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-aop-6.1.6.jar new file mode 100644 index 00000000..2cbe8904 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-aop-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-beans-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-beans-6.1.6.jar new file mode 100644 index 00000000..bcfa3c6e Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-beans-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-context-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-context-6.1.6.jar new file mode 100644 index 00000000..750b3a69 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-context-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-core-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-core-6.1.6.jar new file mode 100644 index 00000000..c6b70253 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-core-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-expression-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-expression-6.1.6.jar new file mode 100644 index 00000000..a649814b Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-expression-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-jcl-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-jcl-6.1.6.jar new file mode 100644 index 00000000..14c446a7 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-jcl-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-web-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-web-6.1.6.jar new file mode 100644 index 00000000..67f06e02 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-web-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/spring-webmvc-6.1.6.jar b/tools/mda-distribution-0.10.0/lib/spring-webmvc-6.1.6.jar new file mode 100644 index 00000000..b55874a0 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/spring-webmvc-6.1.6.jar differ diff --git a/tools/mda-distribution-0.10.0/lib/xmlsec-3.0.3.jar b/tools/mda-distribution-0.10.0/lib/xmlsec-3.0.3.jar new file mode 100644 index 00000000..8ffd06e4 Binary files /dev/null and b/tools/mda-distribution-0.10.0/lib/xmlsec-3.0.3.jar differ diff --git a/tools/aggregator-cli-0.9.2/mda.bat b/tools/mda-distribution-0.10.0/mda.bat similarity index 91% rename from tools/aggregator-cli-0.9.2/mda.bat rename to tools/mda-distribution-0.10.0/mda.bat index 4a45a12f..8dcfdab3 100755 --- a/tools/aggregator-cli-0.9.2/mda.bat +++ b/tools/mda-distribution-0.10.0/mda.bat @@ -1,49 +1,49 @@ -@echo off -setlocal - -REM We need a JVM -if not defined JAVA_HOME ( - echo Error: JAVA_HOME is not defined. - exit /b -) - -if not defined JAVACMD ( - set JAVACMD="%JAVA_HOME%\bin\java.exe" -) - -if not exist %JAVACMD% ( - echo Error: JAVA_HOME is not defined correctly. - echo Cannot execute %JAVACMD% - exit /b -) - -if defined CLASSPATH ( - set LOCALCLASSPATH=%CLASSPATH% -) - -if not defined MDA_HOME ( - echo Error: MDA_HOME is not defined. - exit /b -) - -if not exist "%MDA_HOME%" ( - echo Error: MDA_HOME is not defined correctly. - exit /b -) - -REM add in the dependency .jar files -for %%i in ("%MDA_HOME%\lib\*.jar") do ( - call "%MDA_HOME%\cpappend.bat" %%i -) - -if exist %JAVA_HOME%\lib\tools.jar ( - set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar -) - -if exist %JAVA_HOME%\lib\classes.zip ( - set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip -) - -REM Go to it ! - -%JAVACMD% -classpath "%LOCALCLASSPATH%" %JVMOPTS% net.shibboleth.metadata.cli.SimpleCommandLine %* \ No newline at end of file +@echo off +setlocal + +REM We need a JVM +if not defined JAVA_HOME ( + echo Error: JAVA_HOME is not defined. + exit /b +) + +if not defined JAVACMD ( + set JAVACMD="%JAVA_HOME%\bin\java.exe" +) + +if not exist %JAVACMD% ( + echo Error: JAVA_HOME is not defined correctly. + echo Cannot execute %JAVACMD% + exit /b +) + +if defined CLASSPATH ( + set LOCALCLASSPATH=%CLASSPATH% +) + +if not defined MDA_HOME ( + echo Error: MDA_HOME is not defined. + exit /b +) + +if not exist "%MDA_HOME%" ( + echo Error: MDA_HOME is not defined correctly. + exit /b +) + +REM add in the dependency .jar files +for %%i in ("%MDA_HOME%\lib\*.jar") do ( + call "%MDA_HOME%\cpappend.bat" %%i +) + +if exist %JAVA_HOME%\lib\tools.jar ( + set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar +) + +if exist %JAVA_HOME%\lib\classes.zip ( + set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip +) + +REM Go to it ! + +%JAVACMD% -classpath "%LOCALCLASSPATH%" %JVMOPTS% net.shibboleth.metadata.cli.SimpleCommandLine %* diff --git a/tools/aggregator-cli-0.9.2/mda.sh b/tools/mda-distribution-0.10.0/mda.sh similarity index 96% rename from tools/aggregator-cli-0.9.2/mda.sh rename to tools/mda-distribution-0.10.0/mda.sh index 3313ad9e..bd8abdce 100755 --- a/tools/aggregator-cli-0.9.2/mda.sh +++ b/tools/mda-distribution-0.10.0/mda.sh @@ -41,4 +41,4 @@ do fi done -"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JVMOPTS 'net.shibboleth.metadata.cli.SimpleCommandLine' "$@" \ No newline at end of file +"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JVMOPTS 'net.shibboleth.metadata.cli.SimpleCommandLine' "$@" diff --git a/tools/ukf-mda/jakarta.json-1.1.6.jar b/tools/ukf-mda/jakarta.json-1.1.6.jar deleted file mode 100644 index 1f330765..00000000 Binary files a/tools/ukf-mda/jakarta.json-1.1.6.jar and /dev/null differ diff --git a/tools/ukf-mda/ukf-mda-0.10.0.jar b/tools/ukf-mda/ukf-mda-0.10.0.jar new file mode 100644 index 00000000..e22bfac0 Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.10.0.jar differ diff --git a/tools/ukf-mda/ukf-mda-0.9.11.jar b/tools/ukf-mda/ukf-mda-0.9.11.jar deleted file mode 100644 index b1d4025a..00000000 Binary files a/tools/ukf-mda/ukf-mda-0.9.11.jar and /dev/null differ diff --git a/tools/ukf-mda/ukf-members-1.5.0.jar b/tools/ukf-mda/ukf-members-1.5.0.jar deleted file mode 100644 index d56bb28d..00000000 Binary files a/tools/ukf-mda/ukf-members-1.5.0.jar and /dev/null differ diff --git a/tools/ukf-mda/ukf-members-2.0.0.jar b/tools/ukf-mda/ukf-members-2.0.0.jar new file mode 100644 index 00000000..1268dfc2 Binary files /dev/null and b/tools/ukf-mda/ukf-members-2.0.0.jar differ diff --git a/tools/xalan/impl/serializer-2.11.0.jar b/tools/xalan/impl/serializer-2.11.0.jar deleted file mode 100644 index de9b007b..00000000 Binary files a/tools/xalan/impl/serializer-2.11.0.jar and /dev/null differ diff --git a/tools/xalan/impl/serializer-2.7.3.jar b/tools/xalan/impl/serializer-2.7.3.jar new file mode 100644 index 00000000..47f75d3a Binary files /dev/null and b/tools/xalan/impl/serializer-2.7.3.jar differ diff --git a/tools/xalan/impl/xalan-2.7.1.jar b/tools/xalan/impl/xalan-2.7.1.jar deleted file mode 100644 index 458fa73d..00000000 Binary files a/tools/xalan/impl/xalan-2.7.1.jar and /dev/null differ diff --git a/tools/xalan/impl/xalan-2.7.3.jar b/tools/xalan/impl/xalan-2.7.3.jar new file mode 100644 index 00000000..70854808 Binary files /dev/null and b/tools/xalan/impl/xalan-2.7.3.jar differ diff --git a/tools/xalan/impl/xercesImpl-2.11.0.jar b/tools/xalan/impl/xercesImpl-2.11.0.jar deleted file mode 100644 index 0aaa990f..00000000 Binary files a/tools/xalan/impl/xercesImpl-2.11.0.jar and /dev/null differ diff --git a/tools/xalan/impl/xml-apis-2.11.0.jar b/tools/xalan/impl/xml-apis-2.11.0.jar deleted file mode 100644 index 46733464..00000000 Binary files a/tools/xalan/impl/xml-apis-2.11.0.jar and /dev/null differ diff --git a/tools/xalan/impl/xml-resolver-1.2.jar b/tools/xalan/impl/xml-resolver-1.2.jar deleted file mode 100644 index e535bdc0..00000000 Binary files a/tools/xalan/impl/xml-resolver-1.2.jar and /dev/null differ diff --git a/tools/xalan/lib/joda-time-1.6.jar b/tools/xalan/lib/joda-time-1.6.jar deleted file mode 100644 index 68068a4b..00000000 Binary files a/tools/xalan/lib/joda-time-1.6.jar and /dev/null differ diff --git a/tools/xalan/lib/sdss-xalan-md-1.1.5.jar b/tools/xalan/lib/sdss-xalan-md-1.1.5.jar deleted file mode 100644 index eba7cfdd..00000000 Binary files a/tools/xalan/lib/sdss-xalan-md-1.1.5.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/bcprov-jdk15on-1.53.jar b/tools/xmlsectool-2.0.0/lib/bcprov-jdk15on-1.53.jar deleted file mode 100644 index c9fbafba..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/bcprov-jdk15on-1.53.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/commons-codec-1.10.jar b/tools/xmlsectool-2.0.0/lib/commons-codec-1.10.jar deleted file mode 100644 index 1d7417c4..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/commons-codec-1.10.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/cryptacular-1.0.jar b/tools/xmlsectool-2.0.0/lib/cryptacular-1.0.jar deleted file mode 100644 index 0b8abab6..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/cryptacular-1.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/guava-18.0.jar b/tools/xmlsectool-2.0.0/lib/guava-18.0.jar deleted file mode 100644 index 8f89e490..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/guava-18.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/httpclient-4.3.6.jar b/tools/xmlsectool-2.0.0/lib/httpclient-4.3.6.jar deleted file mode 100644 index 091498c9..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/httpclient-4.3.6.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/httpcore-4.3.3.jar b/tools/xmlsectool-2.0.0/lib/httpcore-4.3.3.jar deleted file mode 100644 index a8747b0c..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/httpcore-4.3.3.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/java-support-7.2.0.jar b/tools/xmlsectool-2.0.0/lib/java-support-7.2.0.jar deleted file mode 100644 index f4be76a1..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/java-support-7.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/jcl-over-slf4j-1.7.12.jar b/tools/xmlsectool-2.0.0/lib/jcl-over-slf4j-1.7.12.jar deleted file mode 100644 index 64ec66f2..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/jcl-over-slf4j-1.7.12.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/jcommander-1.48.jar b/tools/xmlsectool-2.0.0/lib/jcommander-1.48.jar deleted file mode 100644 index ad0a12c9..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/jcommander-1.48.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/joda-time-2.9.jar b/tools/xmlsectool-2.0.0/lib/joda-time-2.9.jar deleted file mode 100644 index 340af06a..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/joda-time-2.9.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/jsr305-3.0.1.jar b/tools/xmlsectool-2.0.0/lib/jsr305-3.0.1.jar deleted file mode 100644 index 021df892..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/jsr305-3.0.1.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/logback-classic-1.1.3.jar b/tools/xmlsectool-2.0.0/lib/logback-classic-1.1.3.jar deleted file mode 100644 index c5ecdeb5..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/logback-classic-1.1.3.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/logback-core-1.1.3.jar b/tools/xmlsectool-2.0.0/lib/logback-core-1.1.3.jar deleted file mode 100644 index c776e4a0..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/logback-core-1.1.3.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-core-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-core-3.2.0.jar deleted file mode 100644 index 5de45828..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-core-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-messaging-api-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-messaging-api-3.2.0.jar deleted file mode 100644 index 07e4689a..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-messaging-api-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-security-api-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-security-api-3.2.0.jar deleted file mode 100644 index 9f0bc71f..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-security-api-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-security-impl-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-security-impl-3.2.0.jar deleted file mode 100644 index 59af529a..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-security-impl-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-api-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-api-3.2.0.jar deleted file mode 100644 index 85673b9c..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-api-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-impl-3.2.0.jar b/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-impl-3.2.0.jar deleted file mode 100644 index 2e8afc5c..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/opensaml-xmlsec-impl-3.2.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/slf4j-api-1.7.12.jar b/tools/xmlsectool-2.0.0/lib/slf4j-api-1.7.12.jar deleted file mode 100644 index 51e2fad1..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/slf4j-api-1.7.12.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/stax-api-1.0-2.jar b/tools/xmlsectool-2.0.0/lib/stax-api-1.0-2.jar deleted file mode 100644 index 015169dc..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/stax-api-1.0-2.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/stax2-api-3.1.4.jar b/tools/xmlsectool-2.0.0/lib/stax2-api-3.1.4.jar deleted file mode 100644 index dded0369..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/stax2-api-3.1.4.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/woodstox-core-asl-4.4.1.jar b/tools/xmlsectool-2.0.0/lib/woodstox-core-asl-4.4.1.jar deleted file mode 100644 index d8b4e8cf..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/woodstox-core-asl-4.4.1.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/xmlsec-2.0.5.jar b/tools/xmlsectool-2.0.0/lib/xmlsec-2.0.5.jar deleted file mode 100644 index 9bc7db6c..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/xmlsec-2.0.5.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/lib/xmlsectool-2.0.0.jar b/tools/xmlsectool-2.0.0/lib/xmlsectool-2.0.0.jar deleted file mode 100644 index e163552d..00000000 Binary files a/tools/xmlsectool-2.0.0/lib/xmlsectool-2.0.0.jar and /dev/null differ diff --git a/tools/xmlsectool-2.0.0/doc/LICENSE.txt b/tools/xmlsectool-3.0.0/doc/LICENSE.txt similarity index 100% rename from tools/xmlsectool-2.0.0/doc/LICENSE.txt rename to tools/xmlsectool-3.0.0/doc/LICENSE.txt diff --git a/tools/xmlsectool-2.0.0/doc/xmlsectool.patch b/tools/xmlsectool-3.0.0/doc/xmlsectool.patch similarity index 100% rename from tools/xmlsectool-2.0.0/doc/xmlsectool.patch rename to tools/xmlsectool-3.0.0/doc/xmlsectool.patch diff --git a/tools/xmlsectool-2.0.0/doc/xmlsectool.spec b/tools/xmlsectool-3.0.0/doc/xmlsectool.spec similarity index 100% rename from tools/xmlsectool-2.0.0/doc/xmlsectool.spec rename to tools/xmlsectool-3.0.0/doc/xmlsectool.spec diff --git a/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar b/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar new file mode 100644 index 00000000..402d108c Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar b/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar new file mode 100644 index 00000000..94aae290 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar b/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar new file mode 100644 index 00000000..f98cde8b Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar b/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar new file mode 100644 index 00000000..f14985ac Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar b/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar new file mode 100644 index 00000000..06214161 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar b/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar new file mode 100644 index 00000000..c9bea2ab Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar b/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar new file mode 100644 index 00000000..9b56dc75 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar b/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar new file mode 100644 index 00000000..f3a78184 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar b/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar new file mode 100644 index 00000000..218ee25f Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar b/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar new file mode 100644 index 00000000..163dc438 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar b/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar new file mode 100644 index 00000000..c6aa5d2b Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar b/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar new file mode 100644 index 00000000..a429c721 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar differ diff --git a/tools/lib/jakarta.activation-1.2.2.jar b/tools/xmlsectool-3.0.0/lib/jakarta.activation-1.2.2.jar similarity index 100% rename from tools/lib/jakarta.activation-1.2.2.jar rename to tools/xmlsectool-3.0.0/lib/jakarta.activation-1.2.2.jar diff --git a/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar new file mode 100644 index 00000000..b8c7dc1e Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar b/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar new file mode 100644 index 00000000..0f497ab0 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar new file mode 100644 index 00000000..f950209c Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar b/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar new file mode 100644 index 00000000..44e9f639 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar b/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar new file mode 100644 index 00000000..1d586730 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar b/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar new file mode 100644 index 00000000..59222d9c Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar new file mode 100644 index 00000000..45832c05 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar b/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar new file mode 100644 index 00000000..bed00c0a Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar b/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar new file mode 100644 index 00000000..487b3956 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar b/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar new file mode 100644 index 00000000..23026b9a Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar new file mode 100644 index 00000000..8477e567 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar new file mode 100644 index 00000000..2764fbcb Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar new file mode 100644 index 00000000..ea158a8b Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar new file mode 100644 index 00000000..8835bcbf Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar new file mode 100644 index 00000000..39724a7c Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar new file mode 100644 index 00000000..b9fb346a Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar b/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar new file mode 100644 index 00000000..29ac26fb Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar new file mode 100644 index 00000000..363dd1b6 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar b/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar new file mode 100644 index 00000000..aca83b6d Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar differ diff --git a/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar b/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar new file mode 100644 index 00000000..37889268 Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar differ diff --git a/tools/xmlsectool-2.0.0/xmlsectool.sh b/tools/xmlsectool-3.0.0/xmlsectool.sh similarity index 80% rename from tools/xmlsectool-2.0.0/xmlsectool.sh rename to tools/xmlsectool-3.0.0/xmlsectool.sh index 3738e3ee..6abfca8a 100755 --- a/tools/xmlsectool-2.0.0/xmlsectool.sh +++ b/tools/xmlsectool-3.0.0/xmlsectool.sh @@ -1,7 +1,7 @@ #! /bin/bash # -# See the Javadoc for the XmlSecTool main class for documentation +# See the Javadoc for the XMLSecTool main class for documentation # of non-zero exit codes. # @@ -46,4 +46,4 @@ do fi done -"$JAVACMD" '-Xmx256m' '-classpath' "$LOCALCLASSPATH" $JVMOPTS '-Dnet.shibboleth.tool.xmlsectool.XMLSecTool.home='"$LOCATION" 'net.shibboleth.tool.xmlsectool.XMLSecTool' "$@" +"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JVMOPTS '-Dnet.shibboleth.tool.xmlsectool.XMLSecTool.home='"$LOCATION" 'net.shibboleth.tool.xmlsectool.XMLSecTool' "$@" diff --git a/utilities/githooks/post-receive b/utilities/githooks/post-receive index 52303df1..946104f4 100755 --- a/utilities/githooks/post-receive +++ b/utilities/githooks/post-receive @@ -11,11 +11,6 @@ apachemdqdir=/var/www/html/mdq.uou/entities # Set the location of the temporary mdq cache dir mdqcachedir=/tmp/mdqcache -# Set the location of JSON discofeed files -jsontempdir=/tmp -discofeed=discofeed.json -discofeedall=discofeed-all.json - # This Git repo has had the latest stuff pushed to it, but it hasn't checked it out yet. So let's do it. git --work-tree=$gitdir --git-dir=$gitdir/.git checkout -f @@ -27,12 +22,6 @@ do done echo "Done." -# The JSON files should have been SCPed to /tmp and be sitting there happily. -echo -n "Gzipping 2 JSON discofeed files..." -gzip -9 < "${jsontempdir}/$discofeed" > "${jsontempdir}/${discofeed}.gz" -gzip -9 < "${jsontempdir}/$discofeedall" > "${jsontempdir}/${discofeedall}.gz" -echo "Done." - # The MDQ cache should have been SCPed to /tmp and be sitting there happily. # First, we should untar it. echo -n "Untarring mdq cache... " @@ -88,14 +77,12 @@ mtime=$(git --work-tree=$gitdir --git-dir=$gitdir/.git show $newrev --quiet --pr echo -n "Setting the timestamp on each file to that of the commit... " find $gitdir -regextype posix-extended -regex '.*\.(xml|gz)' -exec touch -d @$mtime {} \; find $mdqcachedir -exec touch -d @$mtime {} \; -touch -d @$mtime ${jsontempdir}/$discofeed ${jsontempdir}/${discofeed}.gz ${jsontempdir}/$discofeedall ${jsontempdir}/${discofeedall}.gz echo "Done." # Put files into the correct directory echo -n "Rsyncing files to the appropriate apache directory... " rsync -at $gitdir/aggregates/*.{xml,gz} $apacheaggrdir rsync -at --delete $mdqcachedir/ $apachemdqdir -rsync -at ${jsontempdir}/$discofeed ${jsontempdir}/${discofeed}.gz ${jsontempdir}/$discofeedall ${jsontempdir}/${discofeedall}.gz $apacheaggrdir echo "Done." # Remove the temporary files diff --git a/utilities/stats-generate.sh b/utilities/stats-generate.sh index 7017fed2..56824859 100755 --- a/utilities/stats-generate.sh +++ b/utilities/stats-generate.sh @@ -596,19 +596,6 @@ fi # ukf-meta issue 338: These have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669 - -# ===== -# Wugen stats -# ===== - -# Total WAYFless URLs generated -#wugencount=$(grep $date $logslocation/wugen/urlgenerator-audit.* $logslocation/wugen/wayfless-url-generator-audit.* | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') -wugencount=$(grep -s $date $logslocation/wugen/wayfless-url-generator-process.* | grep "Returning wayfless url" | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') - -# New subscribers to WAYFless URLs -wugennewsubs=$(grep -s $date $logslocation/wugen/urlgenerator-process.* $logslocation/wugen/wayfless-url-generator-process.* | grep "Subscribing user and service provider" | wc -l | awk '{ printf ("%'"'"'d\n", $0) }') - - # ===== # Test IdP stats # ===== @@ -695,7 +682,6 @@ if [[ "$timeperiod" == "day" ]]; then msg+=">-> $mdqminqueriesperip/$mdqavgqueriesperip/$mdqmaxqueriesperip min/avg/max queries per querying IP\n" msg+=">-> $mdqcountallentities queries for collection of all entities\n" msg+=">*CDS:* These have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669\n" - msg+=">*Wugen:* $wugencount WAYFless URLs generated, $wugennewsubs new subscriptions.\n" msg+=">*Test IdP:* $testidplogincount logins to $testidpspcount SPs.\n" msg+=">*Test SP:* $testsplogincount logins from $testspidpcount IdPs.\n" msg+=">*Website:* $wwwaccesscountfriendly hits from $wwwaccessipcount unique IPs." @@ -747,10 +733,6 @@ else msg+="Central Discovery Service:\n" msg+="These stats have been removed and will be re-implemented in Splunk. See ukf-systems, issue 669\n" msg+="\n-----\n" - msg+="Wugen:\n" - msg+="-> $wugencount WAYFless URLs generated\n" - msg+="-> $wugennewsubs new subscriptions.\n" - msg+="\n-----\n" msg+="Test IdP usage:\n" msg+="-> $testidplogincount logins to $testidpspcount SPs.\n" msg+="\n-> Logins per test user:\n" diff --git a/utilities/stats-sync.sh b/utilities/stats-sync.sh index be55d972..edfad417 100755 --- a/utilities/stats-sync.sh +++ b/utilities/stats-sync.sh @@ -15,30 +15,17 @@ rsync -at --exclude modsec* stats@md-ne-02:/var/log/httpd/* $logslocation/md/md- rsync -at --exclude modsec* stats@md-we-01:/var/log/httpd/* $logslocation/md/md-we-01/ rsync -at --exclude modsec* stats@md-we-02:/var/log/httpd/* $logslocation/md/md-we-02/ -# Logs from CDS servers -rsync -at --exclude modsec* stats@shibcds-ne-01:/var/log/httpd/* $logslocation/cds/shibcds-ne-01/ -rsync -at --exclude modsec* stats@shibcds-ne-02:/var/log/httpd/* $logslocation/cds/shibcds-ne-02/ -rsync -at --exclude modsec* stats@shibcds-we-01:/var/log/httpd/* $logslocation/cds/shibcds-we-01/ -rsync -at --exclude modsec* stats@shibcds-we-02:/var/log/httpd/* $logslocation/cds/shibcds-we-02/ - # Logs from websites rsync -at --exclude modsec* stats@www-ne-01:/var/log/httpd/* $logslocation/www/www-ne-01/ rsync -at --exclude modsec* stats@www-we-01:/var/log/httpd/* $logslocation/www/www-we-01/ -# Logs from Wugen -rsync -at stats@dockerpub-ne-01:./wugen/wayfless-* $logslocation/wugen/ - # Logs from Test IdP rsync -at --exclude modsec* stats@test-idp:/var/log/httpd/* $logslocation/test-idp/ rsync -at stats@test-idp:/opt/shibboleth-idp/logs/idp-audit* $logslocation/test-idp/ -# Logs from Test SP +# Logs from Test SP inaccessible once the Test SP migrated to 2024 infrastructure # # The Test SP has a cronjob to remove logs with PII > 30 days old, we replicate that in this script -# -rsync -at --exclude modsec* stats@test-sp:/var/log/httpd/* $logslocation/test-sp/ -rsync -at stats@test-sp:/var/log/shibboleth/shibd* $logslocation/test-sp/ -rsync -at stats@test-sp:/var/log/shibboleth/transaction* $logslocation/test-sp/ find $logslocation/test-sp/ -type f -mtime +90 -delete # Exit happily diff --git a/charting/just_ours.xsl b/utilities/thin_aggregate.xsl similarity index 50% rename from charting/just_ours.xsl rename to utilities/thin_aggregate.xsl index 3324d60f..eb10c24f 100644 --- a/charting/just_ours.xsl +++ b/utilities/thin_aggregate.xsl @@ -1,32 +1,21 @@ - + xmlns:math="http://exslt.org/math"> - - - + + +