diff --git a/TODO.md b/TODO.md index 2552321..8a70d88 100644 --- a/TODO.md +++ b/TODO.md @@ -2,14 +2,13 @@ TODO ===== +20220X +- look for both 202205-POST (./gte) and 202205 (Jenkinsfile etc) when changing image versions + 202205 ------- - Once upgrading to 2.6.9, can remove gsh code marked "Temporary fix for GRP-4024" from bootstrap.gsh files - Bug in 2.6.8, attr_read isn't enough to see attributes; need admin privileges on the object to see the option in the menu -- 301.6 and 301.7 slides need to be finished -- 301.8 view privilege on the App folder not enough for kjenkins to view; needs create priv (make a JIRA for this) -- web services in the GTE is protected by sso, so inaccessible by WS clients -- xmlstarlet is not in the Amazon Linux 2 standard images but is in the EPEL repository - Somehow add docker-compose to the vms so we don't have to download it diff --git a/base/Dockerfile b/base/Dockerfile index b2920bf..8842f11 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -93,7 +93,8 @@ RUN chown -R tomcat /opt/shibboleth-idp/ \ RUN chown -R tomcat:tomcat /opt/grouper/grouperWebapp RUN chown -R tomcat:tomcat /opt/tomee -ENV GROUPER_START_DELAY_SECONDS=10 +ENV GROUPER_START_DELAY_SECONDS=10 \ + GROUPER_WS_GROUPER_AUTH=true # note 5005 is for remote Java debugging EXPOSE 389 3306 8080 5005 diff --git a/base/container_files/conf/subject.properties b/base/container_files/conf/subject.properties index 9687cc3..4f03464 100644 --- a/base/container_files/conf/subject.properties +++ b/base/container_files/conf/subject.properties @@ -7,7 +7,8 @@ subjectApi.source.ldap.param.SubjectID_AttributeType.value = employeeNumber subjectApi.source.ldap.param.Name_AttributeType.value = cn subjectApi.source.ldap.param.Description_AttributeType.value = description subjectApi.source.ldap.param.emailAttributeName.value = mail -subjectApi.source.ldap.numberOfAttributes = 8 +subjectApi.source.ldap.param.netId.value = uid +subjectApi.source.ldap.numberOfAttributes = 9 subjectApi.source.ldap.attribute.0.name = uid subjectApi.source.ldap.attribute.0.subjectIdentifier = true subjectApi.source.ldap.attribute.0.translationType = sourceAttributeSameAsSubjectAttribute @@ -36,7 +37,12 @@ subjectApi.source.ldap.attribute.7.name = description subjectApi.source.ldap.attribute.7.formatToLowerCase = false subjectApi.source.ldap.attribute.7.translation = ${source_attribute__cn + ' (' + source_attribute__uid + ')'} subjectApi.source.ldap.attribute.7.translationType = translation -subjectApi.source.ldap.search.search.param.filter.value = (&(|(uid=%TERM%)(employeeNumber=%TERM%)(cn=*%TERM%*))(objectclass=eduPerson)) +subjectApi.source.ldap.attribute.8.name = sortAttribute0 +subjectApi.source.ldap.attribute.8.formatToLowerCase = true +subjectApi.source.ldap.attribute.8.translation = ${subject_attribute__sn + ',' + subject_attribute__givenname} +subjectApi.source.ldap.attribute.8.translationType = translation +subjectApi.source.ldap.attribute.8.internal = true +subjectApi.source.ldap.search.search.param.filter.value = (&(|(uid=%TERM%*)(employeeNumber=%TERM%*)(cn=*%TERM%*))(objectclass=eduPerson)) #todo ??? not created by UI: subjectApi.source.ldap.search.search.param.base.value = ou=people,dc=internet2,dc=edu #todo ??? not created by UI: subjectApi.source.ldap.search.search.param.scope.value = SUBTREE_SCOPE @@ -53,7 +59,7 @@ subjectApi.source.ldap.search.searchSubjectByIdentifier.param.filter.value = (&( subjectApi.source.ldap.searchAttributeCount = 1 subjectApi.source.ldap.searchAttribute.0.attributeName = searchAttribute0 -subjectApi.source.ldap.sortAttribute.0.attributeName = employeeNumber +subjectApi.source.ldap.sortAttribute.0.attributeName = sortAttribute0 subjectApi.source.ldap.sortAttributeCount = 1 subjectApi.source.ldap.param.stringToFindOnCheckConfig.value = Dawn Gilmore diff --git a/base/container_files/shibboleth-idp/metadata/grouper-sp.xml b/base/container_files/shibboleth-idp/metadata/grouper-sp.xml index 4e2ee59..8c54d8b 100644 --- a/base/container_files/shibboleth-idp/metadata/grouper-sp.xml +++ b/base/container_files/shibboleth-idp/metadata/grouper-sp.xml @@ -1,38 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - sp.example.org - CN=sp.example.org,O=Internet2/TIER,L=Ann Arbor,ST=MI,C=US MIIDPDCCAiQCCQDNZe8r0hVtuTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV UzELMAkGA1UECAwCTUkxEjAQBgNVBAcMCUFubiBBcmJvcjEXMBUGA1UECgwOSW50 ZXJuZXQyL1RJRVIxFzAVBgNVBAMMDnNwLmV4YW1wbGUub3JnMB4XDTE3MDkyMjE5 @@ -51,28 +22,11 @@ GdYrH2iSP8WX+Yy7JH5uqkfwWzEntWHJdey39rCWKAUCCB35+/2b4N53Qmlv2+ug CpNJYFtXInd4YMmM5HjXLyoWXtjnKiwDqYUCeYPSwAajnCqRqRXUX0gYTFDRiwRP HbmO9We0nqoc/71nikmGGoSRMO/zWVMFjwmAx1fGiWdU61sjGX8sHifzmVyJVEBI Z75p+JrWYZJYrx/vpWxL8g== - + - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh b/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh index 6336ec4..4ff86e0 100644 --- a/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh +++ b/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh @@ -530,6 +530,8 @@ def group = new GroupSave(gs).assignName("ref:role:all_facstaff").assignDisplayE group.addMember(s, false) } +assignObjectTypeForGroup(group, "ref", "HR, IAM", "Combines the All Faculty plus All Staff reference groups") + /***** Schedule jobs is an upgrade task for 2.5.55 ****/ diff --git a/ex101/run.sh b/ex101/run.sh deleted file mode 100755 index d5d4e64..0000000 --- a/ex101/run.sh +++ /dev/null @@ -1 +0,0 @@ -docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202205 diff --git a/gte b/gte index e3a74bd..8ed30d8 100755 --- a/gte +++ b/gte @@ -1,7 +1,7 @@ #! /bin/bash REPOSITORY=tier/gte -VERSION_TAG=202205 +VERSION_TAG=202205-post EXTRA_ARGS=