lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix role hierarchy (missing new line) (#2689)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-09-24 10:12:26 +03:00
committed by GitHub
parent c20ee8bdf3
commit 1a44acf503
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-mgmt/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java
View File

@@ -54,9 +54,7 @@ class PreAuthorizeEnabledTest extends AbstractSecurityTest {
* Tests whether request returns distribution set if a role with scope is granted for the user * Tests whether request returns distribution set if a role with scope is granted for the user
*/ */
@Test @Test
@WithUser(authorities = { @WithUser(authorities = { "CREATE_DISTRIBUTION_SET", SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne" }, autoCreateTenant = false)
"CREATE_DISTRIBUTION_SET", "READ_DISTRIBUTION_SET_TYPE",
SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne" }, autoCreateTenant = false)
void successIfHasRoleWithScope() throws Exception { void successIfHasRoleWithScope() throws Exception {
createDsOne("successIfHasRoleWithScope"); createDsOne("successIfHasRoleWithScope");
mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> { mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> {
@@ -69,9 +67,7 @@ class PreAuthorizeEnabledTest extends AbstractSecurityTest {
* Tests whether request doesn't return distribution set if a role with scope doesn't grant access * Tests whether request doesn't return distribution set if a role with scope doesn't grant access
*/ */
@Test @Test
@WithUser(authorities = { @WithUser(authorities = { "CREATE_DISTRIBUTION_SET", SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne2" }, autoCreateTenant = false)
"CREATE_DISTRIBUTION_SET", "READ_DISTRIBUTION_SET_TYPE",
SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne2" }, autoCreateTenant = false)
void failIfHasNoForbiddingScope() throws Exception { void failIfHasNoForbiddingScope() throws Exception {
createDsOne("failIfHasNoForbiddingScope"); createDsOne("failIfHasNoForbiddingScope");
mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> { mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> {

4
hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java
View File

@@ -54,9 +54,7 @@ class PreAuthorizeEnabledTest extends AbstractSecurityTest {
* Tests whether request returns distribution set if a role with scope is granted for the user * Tests whether request returns distribution set if a role with scope is granted for the user
*/ */
@Test @Test
@WithUser(authorities = { @WithUser(authorities = { "CREATE_DISTRIBUTION_SET", SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne" }, autoCreateTenant = false)
"CREATE_DISTRIBUTION_SET", "READ_DISTRIBUTION_SET_TYPE",
SpPermission.READ_DISTRIBUTION_SET + "/name==DsOne" }, autoCreateTenant = false)
void successIfHasRoleWithScope() throws Exception { void successIfHasRoleWithScope() throws Exception {
createDsOne("successIfHasRoleWithScope"); createDsOne("successIfHasRoleWithScope");
mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> { mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> {

2
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java
View File

@@ -118,7 +118,7 @@ public final class SpPermission {
READ_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + READ_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
UPDATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + UPDATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
DOWNLOAD_REPOSITORY_ARTIFACT + IMPLY + SOFTWARE_MODULE_DOWNLOAD; DOWNLOAD_REPOSITORY_ARTIFACT + IMPLY + SOFTWARE_MODULE_DOWNLOAD + LINE_BREAK;
public static final String DISTRIBUTION_SET_HIERARCHY = public static final String DISTRIBUTION_SET_HIERARCHY =
CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK + CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK +
READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK + READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK +

2
site/content/concepts/authorization.md
View File

@@ -88,7 +88,7 @@ to hawkBit permissions.
- Artifacts - Artifacts
- DS tags - DS tags
- DOWNLOAD_REPOSITORY_ARTIFACT - SOFTWARE_MODULE_DOWNLOAD
- Permission to download artifacts of a software module (Note: READ_REPOSITORY allows only to read the metadata). - Permission to download artifacts of a software module (Note: READ_REPOSITORY allows only to read the metadata).
- READ_TARGET_SECURITY_TOKEN - READ_TARGET_SECURITY_TOKEN