aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml40
-rw-r--r--pom.xml4
-rw-r--r--releases/2.1.17.yaml4
-rw-r--r--releases/2.1.18.yaml4
-rw-r--r--releases/2.1.19.yaml4
-rw-r--r--shiro-osgi-bundle/pom.xml8
-rw-r--r--shiro/pom.xml17
-rw-r--r--shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java54
-rw-r--r--shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java12
-rw-r--r--sidecar/fproxy/pom.xml2
-rw-r--r--sidecar/pom.xml2
-rw-r--r--sidecar/rproxy/pom.xml7
-rw-r--r--sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java5
-rw-r--r--sidecar/tproxy-config/pom.xml7
-rw-r--r--version.properties2
15 files changed, 124 insertions, 48 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 9f76a7f..b1f9a6d 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -2,7 +2,7 @@
project: 'aaf-cadi'
project_creation_date: '2017-07-12'
project_category: ''
-lifecycle_state: 'Incubation'
+lifecycle_state: 'Unmaintained'
project_lead: &onap_aaf_ptl
name: 'Jonathan Gathman'
email: 'jonathan.gathman@us.att.com'
@@ -20,20 +20,15 @@ mailing_list:
tag: '<[sub-project_name]>'
realtime_discussion: ''
meetings:
- - type: 'zoom'
- agenda: 'https://wiki.onap.org/display/DW/AAF+Meeting+Minutes'
- url: 'https://wiki.onap.org/pages/viewpage.action?pageId=15302787'
+ - type: 'n/a'
+ agenda: 'n/a'
+ url: 'n/a'
server: 'n/a'
channel: 'n/a'
- repeats: 'weekly'
- time: '14:00 UTC'
+ repeats: 'n/a'
+ time: 'n/a'
repositories:
- - 'aaf-authz'
- 'aaf/cadi'
- - 'aaf/luaplugin'
- - 'aaf/oom'
- - 'aaf/sms'
- - 'aaf/sshsm'
committers:
- <<: *onap_aaf_ptl
- name: 'Kiran Kamineni'
@@ -56,5 +51,28 @@ committers:
company: 'ZTE'
id: 'Huabing_Zhao'
timezone: 'China/Chengdu'
+ - name: 'Pawel Baniewski'
+ email: 'pawel.baniewski@nokia.com'
+ company: 'Nokia'
+ id: 'baniewsk'
+ - name: 'Gerard Nugent'
+ email: 'gerard.nugent@est.tech'
+ company: 'esttech'
+ id: 'egernug'
+ timezone: 'Europe/Dublin'
+ - name: 'John Franey'
+ email: 'john.franey@att.com'
+ company: 'ATT'
+ id: 'JohnFraney'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
+ changes:
+ - type: 'Addition'
+ name: 'Pawel Baniewski'
+ link: 'https://lists.onap.org/g/onap-tsc-vote/message/1358'
+ - type: 'Addition'
+ name: 'Gerard Nugent'
+ link: 'https://lists.onap.org/g/onap-tsc-vote/message/1358'
+ - type: 'Addition'
+ name: 'John Franey'
+ link: 'https://lists.onap.org/g/onap-tsc-vote/message/1358'
diff --git a/pom.xml b/pom.xml
index b20804f..fe9e68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
<name>CADI Plugins Parent</name>
<packaging>pom</packaging>
@@ -34,7 +34,7 @@
<properties>
<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
- <cadi.version>2.1.13</cadi.version>
+ <cadi.version>2.7.4</cadi.version>
<!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->
diff --git a/releases/2.1.17.yaml b/releases/2.1.17.yaml
new file mode 100644
index 0000000..7fc3efe
--- /dev/null
+++ b/releases/2.1.17.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.1.17'
+project: 'aaf-cadi'
+log_dir: 'aaf-cadi-maven-stage-master/459/'
diff --git a/releases/2.1.18.yaml b/releases/2.1.18.yaml
new file mode 100644
index 0000000..dfe1206
--- /dev/null
+++ b/releases/2.1.18.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.1.18'
+project: 'aaf-cadi'
+log_dir: 'aaf-cadi-maven-stage-master/481/'
diff --git a/releases/2.1.19.yaml b/releases/2.1.19.yaml
new file mode 100644
index 0000000..93c35e4
--- /dev/null
+++ b/releases/2.1.19.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.1.19'
+project: 'aaf-cadi'
+log_dir: 'aaf-cadi-maven-stage-master/515/'
diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index c7e0a16..228ae37 100644
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
+ <version>4.2.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -56,8 +56,8 @@
javax.net.ssl,
javax.crypto,
javax.crypto.spec,
- javax.xml.bind.annotation,
- javax.xml.bind,
+ javax.xml.bind.annotation;version="[2.0,3)",
+ javax.xml.bind;version="[2.0,3)",
javax.xml.transform,
javax.xml.datatype,
javax.ws.rs,
diff --git a/shiro/pom.xml b/shiro/pom.xml
index ab3f2db..e7044ab 100644
--- a/shiro/pom.xml
+++ b/shiro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -89,11 +89,24 @@
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
index ac62778..247683a 100644
--- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
+++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java
@@ -42,6 +42,7 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
private Access access;
private Principal bait;
+ private List<org.onap.aaf.cadi.Permission> pond;
// Use these to save conversions
private List<org.onap.aaf.cadi.Permission> cPerms;
private List<Permission> oPerms;
@@ -53,6 +54,16 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
cPerms=null;
oPerms=null;
sPerms=null;
+ pond=null;
+ }
+
+ public AAFAuthorizationInfo(Access access, Principal bait, List<org.onap.aaf.cadi.Permission> pond) {
+ this.access = access;
+ this.bait = bait;
+ this.pond = pond;
+ oPerms=null;
+ sPerms=null;
+ cPerms=null;
}
public Principal principal() {
@@ -64,13 +75,20 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
access.log(Level.DEBUG, "AAFAuthorizationInfo.getObjectPermissions");
synchronized(bait) {
if(oPerms == null) {
- oPerms = new ArrayList<>();
- if(cPerms==null) {
- cPerms = new ArrayList<>();
- AAFRealm.singleton.authz.fishAll(bait, cPerms);
- }
- for(final org.onap.aaf.cadi.Permission p : cPerms) {
- oPerms.add(new AAFShiroPermission(p));
+ if (pond != null) {
+ oPerms = new ArrayList<Permission>();
+ for(final org.onap.aaf.cadi.Permission p : pond) {
+ oPerms.add(new AAFShiroPermission(p));
+ }
+ } else {
+ oPerms = new ArrayList<>();
+ if (cPerms == null) {
+ cPerms = new ArrayList<>();
+ AAFRealm.singleton.authz.fishAll(bait, cPerms);
+ }
+ for (final org.onap.aaf.cadi.Permission p : cPerms) {
+ oPerms.add(new AAFShiroPermission(p));
+ }
}
}
}
@@ -89,13 +107,21 @@ public class AAFAuthorizationInfo implements AuthorizationInfo {
access.log(Level.DEBUG,"AAFAuthorizationInfo.getStringPermissions");
synchronized(bait) {
if(sPerms == null) {
- sPerms = new ArrayList<>();
- if(cPerms==null) {
- cPerms = new ArrayList<>();
- AAFRealm.singleton.authz.fishAll(bait,cPerms);
- }
- for(final org.onap.aaf.cadi.Permission p : cPerms) {
- sPerms.add(p.getKey());
+ if (pond != null) {
+ sPerms = new ArrayList<String>();
+ for(org.onap.aaf.cadi.Permission p : pond) {
+ sPerms.add(p.getKey().replace("|", ":"));
+ access.printf(Level.INFO, "%s has %s", bait.getName(), p.getKey());
+ }
+ } else {
+ sPerms = new ArrayList<>();
+ if (cPerms == null) {
+ cPerms = new ArrayList<>();
+ AAFRealm.singleton.authz.fishAll(bait, cPerms);
+ }
+ for (final org.onap.aaf.cadi.Permission p : cPerms) {
+ sPerms.add(p.getKey());
+ }
}
}
}
diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
index d213b01..818ec9e 100644
--- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
+++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
@@ -22,6 +22,7 @@ package org.onap.aaf.cadi.shiro;
import java.io.IOException;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -38,6 +39,7 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.onap.aaf.cadi.Access.Level;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.Permission;
import org.onap.aaf.cadi.PropAccess;
import org.onap.aaf.cadi.Symm;
import org.onap.aaf.cadi.aaf.AAFPermission;
@@ -252,7 +254,7 @@ public class AAFRealm extends AuthorizingRealm {
}
} catch (IOException e) {
singleton.access.log(e);
- }
+ }
}
String err;
try {
@@ -302,7 +304,9 @@ public class AAFRealm extends AuthorizingRealm {
};
}
}
- return new AAFAuthorizationInfo(singleton.access,newBait);
+ List<Permission> pond = new ArrayList<>();
+ singleton.authz.fishAll(newBait,pond);
+ return new AAFAuthorizationInfo(singleton.access,bait,pond);
}
@Override
@@ -328,7 +332,7 @@ public class AAFRealm extends AuthorizingRealm {
return null;
}
}
-
+/*
@Override
public boolean isPermitted(PrincipalCollection principals, String permission) {
logger.debug("AAFRealm.isPermitted(principals,permission<String>)");
@@ -370,5 +374,5 @@ public class AAFRealm extends AuthorizingRealm {
}
return super.isPermitted(permissions, info);
}
-
+*/
}
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 8cd4880..fce139d 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
</parent>
<properties>
diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index 3dca6f1..7634616 100644
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml
index 1e5d5c2..088ac27 100644
--- a/sidecar/rproxy/pom.xml
+++ b/sidecar/rproxy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
</parent>
<properties>
@@ -152,7 +152,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.28.0</version>
@@ -194,7 +194,6 @@
<execution>
<id>generate-images</id>
<phase>install</phase>
- <!--unbind default goal for this phase-->
</execution>
<execution>
<id>push-images</id>
@@ -211,7 +210,7 @@
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
+ </plugin> -->
</plugins>
</build>
</project>
diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
index 6c9665f..068976d 100644
--- a/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
+++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
@@ -176,6 +176,11 @@ public class ReverseProxyMockCadiFilter implements Filter {
}
@Override
+ public String getTarget() {
+ return null;
+ }
+
+ @Override
public RESP authenticate() throws IOException {
return null;
}
diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml
index 1321955..e849c58 100644
--- a/sidecar/tproxy-config/pom.xml
+++ b/sidecar/tproxy-config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.aaf.cadi.sidecar</groupId>
<artifactId>sidecar</artifactId>
- <version>2.1.16-SNAPSHOT</version>
+ <version>2.1.19-SNAPSHOT</version>
</parent>
<artifactId>tproxy-config</artifactId>
@@ -84,7 +84,7 @@
</executions>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.28.0</version>
@@ -120,7 +120,6 @@
<execution>
<id>generate-images</id>
<phase>install</phase>
- <!--unbind default goal for this phase-->
</execution>
<execution>
<id>push-images</id>
@@ -138,7 +137,7 @@
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
+ </plugin> -->
</plugins>
</build>
</project>
diff --git a/version.properties b/version.properties
index 5e52b35..4f38cbc 100644
--- a/version.properties
+++ b/version.properties
@@ -28,7 +28,7 @@
# This TAG <version>2.1.13</version> is here to help remember to change this file. Keep it up to date with the following "real" entries:
major=2
minor=1
-patch=16
+patch=19
base_version=${major}.${minor}.${patch}