Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

minor: add maxUsers to sample configuration #2680

Merged
merged 46 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
214dc88
fix sonar issue: Utility classes should not have public constructors
klaus-sap Oct 10, 2023
d02780e
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Oct 12, 2023
931f880
fix: possibly unnecessary method call
klaus-sap Oct 18, 2023
57bc472
fix: define Java version
klaus-sap Oct 18, 2023
0352bb6
handle in separate PR
klaus-sap Oct 20, 2023
12d1a44
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Oct 23, 2023
006e134
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Oct 30, 2023
9a34f0a
feature: add attribute userConfig.allowedGroups to IdZ
klaus-sap Oct 30, 2023
71b7abb
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Nov 17, 2023
7d2fb2d
revert format changes
strehle Nov 18, 2023
d4c52f4
revert format changes
strehle Nov 18, 2023
ec56ea6
fix Sonar warnings
klaus-sap Nov 20, 2023
ef8f6ca
remove TODO
klaus-sap Nov 20, 2023
9dd1e38
create new needed bean similar than the other beans created
strehle Nov 20, 2023
244110c
is an optional entry in identity zone configuration
strehle Nov 20, 2023
85891ed
Merge branch 'develop' of github.com:cloudfoundry/uaa into klaus-develop
strehle Nov 20, 2023
c7eb6d7
fix sonar smells
strehle Nov 20, 2023
6e6ab18
combine default and allowed groups
klaus-sap Nov 21, 2023
979f933
fix Sonar warnings
klaus-sap Nov 22, 2023
8cde93e
add test class
klaus-sap Nov 22, 2023
b7adddd
add testResultingAllowedGroups
klaus-sap Nov 22, 2023
a464bab
add testScopesIncludesAllowedAuthoritiesForUser
klaus-sap Nov 22, 2023
370be52
zoneId must not be null
klaus-sap Nov 22, 2023
a6722b5
use right asserts
klaus-sap Nov 22, 2023
ab2d5cf
remove null-check
klaus-sap Nov 23, 2023
bd87bed
add integration tests
klaus-sap Nov 23, 2023
fdc6b02
fix createNotAllowedGroupFails
klaus-sap Nov 23, 2023
f400598
introduce list allowedGroups
klaus-sap Nov 23, 2023
163194c
update allowedGroups on server
klaus-sap Nov 23, 2023
1e02b38
pass IdZ id
klaus-sap Nov 23, 2023
c9810f7
determine zone id
klaus-sap Nov 23, 2023
7102503
Merge branch 'develop' of github.com:cloudfoundry/uaa into integratio…
strehle Nov 24, 2023
1291228
update integration tests
strehle Nov 23, 2023
1658023
cleanup in integration tests, fixes mftop
strehle Nov 24, 2023
d1a2cac
Merge remote-tracking branch 'origin/develop' into klaus-rebase
strehle Dec 11, 2023
cc27f66
change log level to info
klaus-sap Dec 14, 2023
ef94dea
remove log message
klaus-sap Dec 14, 2023
56adc44
check for groups which would be not allowed after the update
klaus-sap Dec 15, 2023
86e7f03
must not remove default group from configuration
klaus-sap Dec 18, 2023
5ddf0ca
remove sonar comment
strehle Dec 19, 2023
dfd1fb1
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Dec 21, 2023
ab81926
fix: check for existing groups
klaus-sap Dec 21, 2023
931d5fc
Merge branch 'develop' into develop
strehle Dec 21, 2023
5e347f1
Merge branch 'cloudfoundry:develop' into develop
klaus-sap Jan 17, 2024
cc600f5
add maxUsers to sample configuration
klaus-sap Jan 17, 2024
a6d0383
increase maxUsers
klaus-sap Jan 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,6 @@ void deserialize() {
"profile", "roles", "user_attributes", "uaa.offline_token",
"scim.me", "cloud_controller.user"),
sampleIdentityZone.getConfig().getUserConfig().resultingAllowedGroups());
assertEquals(1000, sampleIdentityZone.getConfig().getUserConfig().getMaxUsers());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,13 @@
"allowedGroups": [
"scim.me",
"cloud_controller.user"
]
],
"maxUsers": 1000
}
},
"name": "Demo Login Page",
"version": 1,
"description": "{\"plan_display_name\":\"Demo\",\"plan_description\":\"Demo SSO Plan\"}",
"created": 1503504273000,
"last_modified": 1504898224000
}
}
Loading