Skip to content

201911 #25

merged 104 commits into from Jan 5, 2020
Merged
Changes from 5 commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
52dd6e1
Update Jenkinsfile
chubing Apr 19, 2019
67961e2
Update common.bash
chubing Apr 19, 2019
f323fbf
Update Jenkinsfile
chubing Apr 19, 2019
9497c39
Update manualBuild.sh
chubing Apr 19, 2019
7729514
Update Dockerfile
chubing Apr 19, 2019
39aef68
Update Jenkinsfile
chubing Apr 19, 2019
97305d6
Update Jenkinsfile
chubing Apr 19, 2019
a442729
Update manualBuild.sh
chubing Apr 19, 2019
97fc4a9
fixed context for oddball builds. paths will stay the same.
wgthom Apr 20, 2019
2dc9ad8
added gte tag to base
wgthom Apr 20, 2019
22f216b
fixed tagging scheme for image builds
wgthom Apr 20, 2019
d53ec91
fixed typo
wgthom Apr 20, 2019
dc720ba
added version tag
wgthom Apr 20, 2019
acd82d5
added version tag
wgthom Apr 20, 2019
4fbf26a
Update Dockerfile
wgthom Apr 20, 2019
2d75fc1
Create buildVersion.sh
wgthom Apr 20, 2019
41162de
updated 101 build to use VERSION_TAG
wgthom Apr 20, 2019
26b8dde
updated to use VERSION_TAG
wgthom Apr 20, 2019
6076c4d
updated to use VERSION_TAG
wgthom Apr 20, 2019
14cdb62
updated to use VERSION_TAG
wgthom Apr 20, 2019
d06a8ed
added VERSION_TAG to jenkins build
wgthom Apr 20, 2019
05e30ea
Update manualBuild.sh
wgthom Apr 20, 2019
1c99a6c
Update Jenkinsfile
wgthom Apr 20, 2019
dd934df
add VERSION_TAG to rest of build
wgthom Apr 20, 2019
40d0ec6
Update Jenkinsfile
wgthom Apr 20, 2019
9326941
Update buildVersion.sh
wgthom Apr 20, 2019
f0a55ed
Update Jenkinsfile
wgthom Apr 23, 2019
d463a7d
updated USERTOKEN
wgthom Apr 23, 2019
d8d92ac
Update README
dima767 Apr 23, 2019
bcb35c2
Update to tier shib-idp 3.4 immage wip
dima767 Apr 23, 2019
3820f6d
polishing
dima767 Apr 24, 2019
7e1c4f2
Merge pull request #13 from docker/201906-shib-upgrade
wgthom Apr 26, 2019
4957de7
Reworked readme
wgthom Apr 26, 2019
387d0e0
markdown updates
wgthom Apr 26, 2019
3e3c897
minor updates
wgthom Apr 26, 2019
91d1ffa
polish
wgthom Apr 26, 2019
83a5bd3
minor update
wgthom Apr 26, 2019
bd00217
minor update
wgthom Apr 27, 2019
f41a015
ignore spell check
wgthom Apr 27, 2019
38bcfc9
spelling
wgthom Apr 27, 2019
4bd952c
minor update
wgthom Apr 27, 2019
b188372
disable docker HEALTHCHECK
wgthom Apr 27, 2019
9a9ba2d
Merge branch '201906' of https://github.internet2.edu/docker/grouper_…
wgthom Apr 27, 2019
d9c6ad7
ignore .vscode
wgthom Apr 27, 2019
eb28c50
updated pspng config to match new app template
wgthom May 23, 2019
e355a46
initial docs import
wgthom May 29, 2019
2622d85
ignore build
wgthom May 29, 2019
5ec39bf
Merge branch '201906' of https://github.internet2.edu/docker/grouper_…
wgthom May 29, 2019
3cbe7e5
content added to index.rst
wgthom May 29, 2019
7b7bb06
moved ref and basis groups up to 201.1.1
wgthom May 30, 2019
2893834
rabbitmq start script
wgthom May 30, 2019
cb58886
content updates for 201
wgthom May 30, 2019
f1e39d8
gte command
wgthom May 30, 2019
d74239e
Merge pull request #16 from docker/201906-201-updates
wgthom May 30, 2019
03f891f
fixed docker image tag
wgthom May 30, 2019
0a5206b
added ref and basis tags to class groups
wgthom May 30, 2019
698c393
typo fix
wgthom May 30, 2019
82a7cb3
updated content for 2.1.2
wgthom May 31, 2019
6b9c6d9
updated gte for 201.2
wgthom May 31, 2019
58e9a1f
Merge branch '201906-201-updates' of https://github.internet2.edu/doc…
wgthom May 31, 2019
14448df
added gte version folders
wgthom May 31, 2019
ef92a1f
content update for 201.3
wgthom May 31, 2019
9ef07c2
added gte version folder
wgthom May 31, 2019
7bb5970
gte update for 201.3
wgthom May 31, 2019
0535d6c
Merge pull request #17 from docker/201906-201-updates
wgthom May 31, 2019
15eadaa
update headings
wgthom Jun 1, 2019
b2a62bf
content and gte updates for 201.4
wgthom Jun 1, 2019
1b6e586
Merge pull request #18 from docker/201906-201-updates
wgthom Jun 1, 2019
a934c58
content and gte updates for 201.5
wgthom Jun 2, 2019
df4b2b5
Merge pull request #19 from docker/201906-201-updates
wgthom Jun 2, 2019
604dde4
401.1 updates WIP
wgthom Jun 3, 2019
686644c
401 updates
wgthom Jun 6, 2019
8c80828
updates for 401 gte
wgthom Jun 6, 2019
db80bcc
Merge pull request #20 from docker/201906-201-updates
wgthom Jun 6, 2019
5b7d16c
content and gte updates for 401.2
wgthom Jun 7, 2019
6241645
Merge pull request #21 from docker/201906-201-updates
wgthom Jun 7, 2019
95c7d3b
401.3 content and gte updates
wgthom Jun 8, 2019
cd4cb48
401.5.7 updates
wgthom Jun 8, 2019
6cefbad
updates for 401.3
wgthom Jun 8, 2019
2adc619
updates for 401.3
wgthom Jun 8, 2019
59f9271
Merge pull request #22 from docker/201906-201-updates
wgthom Jun 8, 2019
01335e7
gte and content updates for 401.4
wgthom Jun 8, 2019
42680ba
Merge pull request #23 from docker/201906-201-updates
wgthom Jun 8, 2019
6a86074
gte helper scripts
wgthom Jun 9, 2019
fdf8fec
shib idp branding
wgthom Jun 9, 2019
3df83f2
updates for 201.1 and 201.2
wgthom Jun 10, 2019
fa3e0d9
updates for 201.3
wgthom Jun 10, 2019
2538c22
updates for 201.4
wgthom Jun 10, 2019
88437a0
201.5 updates
wgthom Jun 10, 2019
cb1ff40
404.4 update
wgthom Jun 10, 2019
2b188dd
Merge pull request #24 from docker/201906-201-updates
wgthom Jun 10, 2019
caf0648
cleaned up readme a bit
wgthom Jun 10, 2019
a98f774
readme fix
wgthom Jun 10, 2019
dc80644
added gdg folders, groups, and subjects to 101.1.1
wgthom Jun 10, 2019
31e9d88
added gdg folders, ref/basis groups, subjects
wgthom Jun 10, 2019
7eb4a39
grouper version at 2.4.0-a47-u25-w5-p6-20190611
wgthom Jun 12, 2019
a5c7fdb
grouper 2.4a64 101/201 updates
wgthom Jun 13, 2019
9c33823
updates for 401
wgthom Jun 13, 2019
7d70be3
only build setup and end for each module
wgthom Jun 13, 2019
80b9a9f
update for 201911 build
wgthom Oct 5, 2019
aa25e9e
updates for 201911 build
wgthom Oct 5, 2019
7f58304
update to grouper:latest and fix mysql install
wgthom Oct 9, 2019
2741016
enable config in ui for any IP address
wgthom Oct 29, 2019
9314d1f
grouper build for temple
wgthom Nov 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
323 changes: 209 additions & 114 deletions docs/401/401.3.rst

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/401/examples/401.3.2-grouper-loader.properties
@@ -94,7 +94,7 @@ changeLog.consumer.pspng_entitlements.type = edu.internet2.middleware.grouper.ps
changeLog.consumer.pspng_entitlements.quartzCron = 0 * * * * ?
changeLog.consumer.pspng_entitlements.ldapPoolName = demo
changeLog.consumer.pspng_entitlements.provisionedAttributeName = eduPersonEntitlement
changeLog.consumer.pspng_entitlements.provisionedAttributeValueFormat = ${group.name.equalsIgnoreCase('app:mfa:mfa_enabled') ? 'http://tier.internet2.edu/mfa/enabled' : (group.name.equalsIgnoreCase('app:boardeffect:boardeffect_authorized') ? 'https://college.boardeffect.com/' : 'urn:mace:example.edu:' + group.extension) }
changeLog.consumer.pspng_entitlements.provisionedAttributeValueFormat = ${group.name.equalsIgnoreCase('app:mfa:mfa_enabled') ? 'http://tier.internet2.edu/mfa/enabled' : (group.name.equalsIgnoreCase('app:board_effect:service:policy:board_effect_access') ? 'https://college.boardeffect.com/' : 'urn:mace:example.edu:' + group.extension) }
changeLog.consumer.pspng_entitlements.userSearchBaseDn = ou=people,dc=internet2,dc=edu
changeLog.consumer.pspng_entitlements.userSearchFilter = uid=${subject.id}
changeLog.consumer.pspng_entitlements.allProvisionedValuesPrefix=*
Binary file added docs/figures/401-board-effect-ann-admin-priv.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-ann-privs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-app.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-final-privs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-my-groups.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-rabbitmq.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figures/401-board-effect-workroom.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ex401/ex401.1.1/container_files/grouper-loader.properties
@@ -94,7 +94,7 @@ changeLog.consumer.pspng_entitlements.type = edu.internet2.middleware.grouper.ps
changeLog.consumer.pspng_entitlements.quartzCron = 0 * * * * ?
changeLog.consumer.pspng_entitlements.ldapPoolName = demo
changeLog.consumer.pspng_entitlements.provisionedAttributeName = eduPersonEntitlement
changeLog.consumer.pspng_entitlements.provisionedAttributeValueFormat = ${group.name.equalsIgnoreCase('app:mfa:service:policy:mfa_enabled') ? 'http://tier.internet2.edu/mfa/enabled' : 'urn:mace:example.edu:' + group.extension}
changeLog.consumer.pspng_entitlements.provisionedAttributeValueFormat = ${group.name.equalsIgnoreCase('app:mfa:service:policy:mfa_enabled') ? 'http://tier.internet2.edu/mfa/enabled' : (group.name.equalsIgnoreCase('app:board_effect:service:policy:board_effect_access') ? 'https://college.boardeffect.com/' : 'urn:mace:example.edu:' + group.extension)}
changeLog.consumer.pspng_entitlements.userSearchBaseDn = ou=people,dc=internet2,dc=edu
changeLog.consumer.pspng_entitlements.userSearchFilter = uid=${subject.id}
changeLog.consumer.pspng_entitlements.allProvisionedValuesPrefix=*
2 changes: 2 additions & 0 deletions ex401/ex401.3.1/container_files/seed-data/bootstrap.gsh
@@ -1 +1,3 @@
gs = GrouperSession.startRootSession();
delStem("401.2.end")
addRootStem("401.3.1", "401.3.1")
2 changes: 1 addition & 1 deletion ex401/ex401.3.end/Dockerfile
@@ -1,5 +1,5 @@
ARG VERSION_TAG
FROM tier/gte:401.3.7-$VERSION_TAG
FROM tier/gte:401.3.1-$VERSION_TAG

LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
Vendor="TIER" \
100 changes: 84 additions & 16 deletions ex401/ex401.3.end/container_files/seed-data/bootstrap.gsh
@@ -1,26 +1,94 @@
gs = GrouperSession.startRootSession();
delStem("401.3.1")
addRootStem("401.3.end", "401.3.end")

addStem("ref", "board", "board");
// 401.3.1
parent_stem_path = "app";
app_extension = "board_effect";
app_name = "board_effect";

group = GroupFinder.findByName(gs, "app:boardeffect:ref:cmt_fin", true);
stem = StemFinder.findByName(gs, "ref:board", true);
group.move(stem);
stem = addStem(parent_stem_path, app_extension, app_name);
security = addStem(stem.name, "security", "security");
service = addStem(stem.name, "service", "service");
policy = addStem(service.name, "policy", "policy");
ref = addStem(service.name, "ref", "ref");

admin_group_name = "${app_extension}Admins";
admin_group = addGroup(security.name, admin_group_name, admin_group_name);
mgr_group_name = "${app_extension}Updaters";
mgr_group = addGroup(security.name, mgr_group_name, mgr_group_name);
view_group_name = "${app_extension}Readers";
view_group = addGroup(security.name, view_group_name, view_group_name);

addGroup("app:board_effect:service:policy", "board_effect_access", "board_effect_access");
addGroup("app:board_effect:service:policy", "board_effect_access_allow", "board_effect_access_allow");
addGroup("app:board_effect:service:policy", "board_effect_access_deny", "board_effect_access_deny");
addComposite("app:board_effect:service:policy:board_effect_access", CompositeType.COMPLEMENT, "app:board_effect:service:policy:board_effect_access_allow", "app:board_effect:service:policy:board_effect_access_deny");

// 401.3.2
addGroup("app:board_effect:service:policy", "workroom_finance", "workroom_finance");
addGroup("app:board_effect:service:policy", "workroom_finance_allow", "workroom_finance_allow");
addGroup("app:board_effect:service:policy", "workroom_finance_deny", "workroom_finance_deny");
addComposite("app:board_effect:service:policy:workroom_finance", CompositeType.COMPLEMENT, "app:board_effect:service:policy:workroom_finance_allow", "app:board_effect:service:policy:workroom_finance_deny");
addMember("app:board_effect:service:policy:board_effect_access_allow", "app:board_effect:service:policy:workroom_finance");

// 401.3.3 nothing to do
// 401.3.4 nothing to do

addStem("ref:board", "etc", "etc");
group2 = addGroup("ref:board:etc", "board_managers", "board_managers");
// 401.3.5
addGroup("app:board_effect:service:ref", "finance_committee", "finance_committee");
grantPriv("app:board_effect:service:ref:finance_committee", "app:board_effect:security:board_effectAdmins", AccessPrivilege.ADMIN);
addMember("app:board_effect:service:policy:workroom_finance_allow", "app:board_effect:service:ref:finance_committee");
addMember("app:board_effect:security:board_effectAdmins", "amartinez410");

addMember("ref:board:etc:board_managers", "ref:roles:president_assistant");
GrouperSession.start(findSubject("amartinez410"))
addMember("app:board_effect:service:ref:finance_committee", "ksmith3")
gs = GrouperSession.startRootSession();

// 401.3.6
addGroup("app:board_effect:service:ref", "finance_committee_helpers", "finance_committee_helpers");
addMember("app:board_effect:service:policy:workroom_finance_allow", "app:board_effect:service:ref:finance_committee_helpers");
addGroup("app:board_effect:service:ref", "workroom_helpers", "workroom_helpers");
addMember("app:board_effect:service:policy:workroom_finance_allow", "app:board_effect:service:ref:workroom_helpers");

group_name = "app:board_effect:service:ref:workroom_helpers";
workroom_helpers = GroupFinder.findByName(gs, group_name);
numDays = 3;
actAs = SubjectFinder.findRootSubject();
attribAssign = workroom_helpers.getAttributeDelegate().addAttribute(RuleUtils.ruleAttributeDefName()).getAttributeAssign();
attribValueDelegate = attribAssign.getAttributeValueDelegate();
attribValueDelegate.assignValue(RuleUtils.ruleActAsSubjectSourceIdName(), actAs.getSourceId());
attribValueDelegate.assignValue(RuleUtils.ruleRunDaemonName(), "F");
attribValueDelegate.assignValue(RuleUtils.ruleActAsSubjectIdName(), actAs.getId());
attribValueDelegate.assignValue(RuleUtils.ruleCheckTypeName(), RuleCheckType.membershipAdd.name());
attribValueDelegate.assignValue(RuleUtils.ruleIfConditionEnumName(), RuleIfConditionEnum.thisGroupHasImmediateEnabledNoEndDateMembership.name());
attribValueDelegate.assignValue(RuleUtils.ruleThenEnumName(), RuleThenEnum.assignMembershipDisabledDaysForOwnerGroupId.name());
attribValueDelegate.assignValue(RuleUtils.ruleThenEnumArg0Name(), numDays.toString());
attribValueDelegate.assignValue(RuleUtils.ruleThenEnumArg1Name(), "T");

// 401.3.7
addStem("ref", "role", "role");
addGroup("ref:role", "president_assistant", "president_assistant");
addMember("ref:role:president_assistant", "amartinez410");
addMember("app:board_effect:security:board_effectUpdaters", "ref:role:president_assistant");
delMember("app:board_effect:security:board_effectAdmins", "amartinez410");

grantPriv("ref:board:cmt_fin", group2.toSubject().id, AccessPrivilege.UPDATE);
grantPriv("ref:board:cmt_fin", group2.toSubject().id, AccessPrivilege.READ);
// 401.3.8
addStem("ref", "board", "board");
group = GroupFinder.findByName(gs, "app:board_effect:service:ref:finance_committee", true);
stem = StemFinder.findByName(gs, "ref:board", true);
group.move(stem);

boardeffect_admins = GroupFinder.findByName(gs, "app:boardeffect:etc:boardeffect_admins", true);
boardeffect_mgr = GroupFinder.findByName(gs, "app:boardeffect:etc:boardeffect_mgr", true);
boardeffect_viewers = GroupFinder.findByName(gs, "app:boardeffect:etc:boardeffect_viewers", true);
addStem("ref:board", "security", "security");
group2 = addGroup("ref:board:security", "boardUpdaters", "boardUpdaters");
grantPriv("ref:board:finance_committee", group2.toSubject().id, AccessPrivilege.UPDATE);
grantPriv("ref:board:finance_committee", group2.toSubject().id, AccessPrivilege.READ);
addMember("ref:board:security:boardUpdaters", "ref:role:president_assistant");

revokePriv("ref:board:cmt_fin", boardeffect_admins.toSubject().id, AccessPrivilege.ADMIN);
revokePriv("ref:board:cmt_fin", boardeffect_mgr.toSubject().id, AccessPrivilege.UPDATE);
revokePriv("ref:board:cmt_fin", boardeffect_mgr.toSubject().id, AccessPrivilege.READ);
boardeffectAdmins = GroupFinder.findByName(gs, "app:board_effect:security:board_effectAdmins", true);
boardeffectUpdaters = GroupFinder.findByName(gs, "app:board_effect:security:board_effectUpdaters", true);

revokePriv("ref:board:cmt_fin", boardeffect_viewers.toSubject().id, AccessPrivilege.READ);
revokePriv("ref:board:finance_committee", boardeffectAdmins.toSubject().id, AccessPrivilege.ADMIN);
revokePriv("ref:board:finance_committee", boardeffectUpdaters.toSubject().id, AccessPrivilege.UPDATE);
revokePriv("ref:board:finance_committee", boardeffectUpdaters.toSubject().id, AccessPrivilege.READ);

6 changes: 0 additions & 6 deletions ex401/manualBuild.sh
@@ -5,12 +5,6 @@ docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.1-${VER
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.1-${VERSION_TAG} ex401.2.1 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.end-${VERSION_TAG} ex401.2.end \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.1-${VERSION_TAG} ex401.3.1 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.2-${VERSION_TAG} ex401.3.2 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.3-${VERSION_TAG} ex401.3.3 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.4-${VERSION_TAG} ex401.3.4 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.5-${VERSION_TAG} ex401.3.5 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.6-${VERSION_TAG} ex401.3.6 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.7-${VERSION_TAG} ex401.3.7 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.end-${VERSION_TAG} ex401.3.end \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.4.1-${VERSION_TAG} ex401.4.1 \
&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.4.end-${VERSION_TAG} ex401.4.end