aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-security-common
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2020-09-09 12:51:02 +0200
committerMartin Stockhammer <martin_s@apache.org>2020-09-09 12:51:02 +0200
commit61a94c93a5f307dfa40713691f128de82cc434cc (patch)
tree723ff86cb91484194fb2e3dc4aae27ab12236b82 /archiva-modules/archiva-base/archiva-security-common
parent780886fcdc840e818198d108bbaa876a442e27e1 (diff)
downloadarchiva-61a94c93a5f307dfa40713691f128de82cc434cc.tar.gz
archiva-61a94c93a5f307dfa40713691f128de82cc434cc.zip
Adapting for the privilege change regarding resource annotations in redback.
Diffstat (limited to 'archiva-modules/archiva-base/archiva-security-common')
-rw-r--r--archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java2
-rw-r--r--archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml11
2 files changed, 13 insertions, 0 deletions
diff --git a/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java b/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
index 814fc3bbd..36ab17c6a 100644
--- a/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
+++ b/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
@@ -64,6 +64,8 @@ public class ArchivaRoleConstants
public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository";
+ public static final String OPERATION_FILE_UPLOAD = "archiva-upload-file";
+
public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact";
public static final String OPERATION_MERGE_REPOSITORY = "archiva-merge-repository";
diff --git a/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml b/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
index e771f165c..3960314a4 100644
--- a/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
+++ b/archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
@@ -84,6 +84,11 @@
<description>Upload Archiva Repository</description>
</operation>
<operation>
+ <id>archiva-upload-file</id>
+ <name>archiva-upload-file</name>
+ <description>Upload File to Archiva</description>
+ </operation>
+ <operation>
<id>archiva-access-repository</id>
<name>archiva-access-repository</name>
<description>Access Archiva Repository</description>
@@ -258,6 +263,12 @@
<resource>${resource}</resource>
</permission>
<permission>
+ <id>archiva-upload-file</id>
+ <name>Archiva Upload File to Archiva</name>
+ <operation>archiva-upload-file</operation>
+ <resource>global</resource>
+ </permission>
+ <permission>
<id>archiva-view-audit-logs</id>
<name>Archiva View Audit Logs</name>
<operation>archiva-view-audit-logs</operation>