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

Merge branch 'master' into feature_rollouts_credentials

Browse Source 
Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ReportManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-06-06 10:35:02 +02:00
parent 8c972a89e3 487cb73caf
commit 9c7f48ded5
468 changed files with 18936 additions and 12963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,6 +372,15 @@ public final class SpPermission {
public static final String HAS_AUTH_ROLLOUT_MANAGEMENT_READ = HAS_AUTH_PREFIX + ROLLOUT_MANAGEMENT
+ HAS_AUTH_SUFFIX;
/**
* Spring security eval hasAuthority expression to check if spring
* context contains {@link SpPermission#ROLLOUT_MANAGEMENT} and
* {@link SpPermission#READ_TARGET}
*/
public static final String HAS_AUTH_ROLLOUT_MANAGEMENT_READ_AND_TARGET_READ = HAS_AUTH_PREFIX
+ ROLLOUT_MANAGEMENT + HAS_AUTH_SUFFIX + HAS_AUTH_AND + HAS_AUTH_PREFIX + READ_TARGET
+ HAS_AUTH_SUFFIX;;
/**
* Spring security eval hasAuthority expression to check if spring
* context contains {@link SpPermission#ROLLOUT_MANAGEMENT} and

2
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
View File

@@ -64,6 +64,8 @@ public class SystemSecurityContext {
* the callable to call within the system security context
* @return the return value of the {@link Callable#call()} method.
*/
// Exception squid:S2221 - Callable declares Exception
@SuppressWarnings("squid:S2221")
public <T> T runAsSystem(final Callable<T> callable) {
final SecurityContext oldContext = SecurityContextHolder.getContext();
try {