import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
List<SecuritySetter<HttpURLConnection>> lss = loadSetters(access,si);
/////////
print(true,"Test Connections driven by AAFLocator");
- URI serviceURI = new URI(Defaults.AAF_URL);
+ URI serviceURI = uri(access,"service");
for (URI uri : new URI[] {
serviceURI,
- new URI(Defaults.OAUTH2_TOKEN_URL),
- new URI(Defaults.OAUTH2_INTROSPECT_URL),
- new URI(Defaults.CM_URL),
- new URI(Defaults.GUI_URL),
- new URI(Defaults.FS_URL),
- new URI(Defaults.HELLO_URL)
+ uri(access,"token"),
+ uri(access,"introspect"),
+ uri(access,"cm"),
+ uri(access,"gui"),
+ uri(access,"fs"),
+ uri(access,"hello")
}) {
Locator<URI> locator = new AAFLocator(si, uri);
try {
//////////
print(true,"Test essential BasicAuth Service call, driven by AAFLocator");
+ boolean hasBath=false;
for (SecuritySetter<HttpURLConnection> ss : lss) {
if (ss instanceof HBasicAuthSS) {
+ hasBath=true;
basicAuthTest(new AAFLocator(si, serviceURI),ss);
}
}
+ if(!hasBath) {
+ System.out.println("No User/Password to test");
+ }
} catch (Exception e) {
e.printStackTrace(System.err);
}
}
- private static List<SecuritySetter<HttpURLConnection>> loadSetters(PropAccess access, SecurityInfoC<HttpURLConnection> si) {
+ private static URI uri(PropAccess access, String ms) throws URISyntaxException {
+ String aaf_root_ns = access.getProperty(Config.AAF_ROOT_NS,"AAF_NS");
+ String aaf_api_version = access.getProperty(Config.AAF_API_VERSION,Config.AAF_DEFAULT_API_VERSION);
+ String aaf_locate_url = access.getProperty(Config.AAF_LOCATE_URL,Defaults.AAF_LOCATE_CONST);
+ if("cm".equals(ms) && "2.0".equals(aaf_api_version)) {
+ ms = "certman";
+ }
+ return new URI(aaf_locate_url + "/locate/" + aaf_root_ns + '.' + ms + ':' + aaf_api_version);
+ }
+
+ private static List<SecuritySetter<HttpURLConnection>> loadSetters(PropAccess access, SecurityInfoC<HttpURLConnection> si) {
print(true,"Load Security Setters from Configuration Information");
String user = access.getProperty(Config.AAF_APPID);
HClient client = new HClient(ss, uri, 3000);
client.setMethod("GET");
String user = ss.getID();
- if (user.indexOf('@')<0) {
- user+="@isam.att.com";
- }
+
client.setPathInfo("/authz/perms/user/"+user);
client.send();
Future<String> future = client.futureReadString();
import java.util.Map.Entry;
import java.util.Properties;
+import org.onap.aaf.cadi.Access;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.CmdLine;
import org.onap.aaf.cadi.LocatorException;
env = new RosettaEnv(access.getProperties());
Deque<String> cmds = new ArrayDeque<String>();
for (String p : args) {
+ int eq;
if ("-noexit".equalsIgnoreCase(p)) {
doExit = false;
- } else if (p.indexOf('=') < 0) {
+ } else if ((eq=p.indexOf('=')) < 0) {
cmds.add(p);
+ } else {
+ access.setProperty(p.substring(0,eq), p.substring(eq+1));
}
}
keypairGen(trans, access, cmds);
break;
case "config":
- if (access.getProperty(Config.CADI_PROP_FILES)!=null) {
- // Get Properties from initialization Prop Files
- config(trans,access,null,cmds);
- } else {
- // Get Properties from existing AAF Instance
- config(trans,access,aafcon(access),cmds);
- }
+ config(trans,access,args,cmds);
break;
case "validate":
validate(access);
}
}
- private static synchronized AAFCon<?> aafcon(PropAccess access) throws APIException, CadiException, LocatorException {
+ private static synchronized AAFCon<?> aafcon(Access access) throws APIException, CadiException, LocatorException {
if (aafcon==null) {
aafcon = new AAFConHttp(access,Config.CM_URL);
}
System.out.printf("Wrote %s\n", f.getCanonicalFile());
}
- private static void config(Trans trans, PropAccess pa, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
-
+ private static void config(Trans trans, PropAccess propAccess, String[] args, Deque<String> cmds) throws Exception {
TimeTaken tt = trans.start("Get Configuration", Env.REMOTE);
try {
final String fqi = fqi(cmds);
Artifact arti = new Artifact();
- arti.setDir(pa.getProperty(Config.CADI_ETCDIR, "."));
+ arti.setDir(propAccess.getProperty(Config.CADI_ETCDIR, "."));
arti.setNs(FQI.reverseDomain(fqi));
PropHolder loc = PropHolder.get(arti, "location.props");
PropHolder cred = PropHolder.get(arti,"cred.props");
PropHolder app= PropHolder.get(arti,"props");
+ for(String c : args) {
+ int idx = c.indexOf('=');
+ if(idx>0) {
+ app.add(c.substring(0,idx), c.substring(idx+1));
+ }
+ }
app.add(Config.CADI_PROP_FILES, loc.getPath()+':'+cred.getPath());
for (String tag : LOC_TAGS) {
- loc.add(tag, getProperty(pa, trans, false, tag, "%s: ",tag));
+ loc.add(tag, getProperty(propAccess, trans, false, tag, "%s: ",tag));
}
cred.add(Config.CADI_KEYFILE, cred.getKeyPath());
- cred.addEnc(Config.AAF_APPPASS, pa, null);
+ final String ssoAppID = propAccess.getProperty(Config.AAF_APPID);
+ if(fqi.equals(ssoAppID)) {
+ cred.addEnc(Config.AAF_APPPASS, propAccess, null);
+ // only Ask for Password when starting scratch
+ } else if(propAccess.getProperty(Config.CADI_PROP_FILES)==null) {
+ char[] pwd = AAFSSO.cons.readPassword("Password for %s: ", fqi);
+ if(pwd.length>0) {
+ cred.addEnc(Config.AAF_APPPASS, new String(pwd));
+ }
+ }
- app.add(Config.AAF_LOCATE_URL, pa, null);
+ app.add(Config.AAF_LOCATE_URL, propAccess, null);
app.add(Config.AAF_APPID, fqi);
- app.add(Config.AAF_URL, pa, Defaults.AAF_URL);
+ app.add(Config.AAF_URL, propAccess, Defaults.AAF_URL);
- String cts = pa.getProperty(Config.CADI_TRUSTSTORE);
+ String cts = propAccess.getProperty(Config.CADI_TRUSTSTORE);
if (cts!=null) {
File origTruststore = new File(cts);
if (!origTruststore.exists()) {
// Try same directory as cadi_prop_files
- String cpf = pa.getProperty(Config.CADI_PROP_FILES);
+ String cpf = propAccess.getProperty(Config.CADI_PROP_FILES);
if (cpf!=null) {
for (String f : Split.split(File.pathSeparatorChar, cpf)) {
File fcpf = new File(f);
Files.copy(origTruststore.toPath(), newTruststore.toPath());
}
- cred.add(Config.CADI_TRUSTSTORE, pa, newTruststore.getCanonicalPath());
- cred.add(Config.CADI_TRUSTSTORE_PASSWORD, pa, "changeit" /* Java default */);
+ cred.add(Config.CADI_TRUSTSTORE, propAccess, newTruststore.getCanonicalPath());
+ cred.addEnc(Config.CADI_TRUSTSTORE_PASSWORD, propAccess, "changeit" /* Java default */);
- if (aafcon!=null) { // get Properties from Remote AAF
- final String locator = getProperty(pa,aafcon.env,false,Config.AAF_LOCATE_URL,"AAF Locator URL: ");
-
- Future<Configuration> acf = aafcon.client(new SingleEndpointLocator(locator))
- .read("/configure/"+fqi+"/aaf", configDF);
- if (acf.get(TIMEOUT)) {
- for (Props props : acf.value.getProps()) {
- PropHolder ph = CRED_TAGS.contains(props.getTag())?cred:app;
- if(props.getTag().endsWith("_password")) {
- ph.addEnc(props.getTag(), props.getValue());
- } else {
- ph.add(props.getTag(), props.getValue());
- }
+ String cpf = propAccess.getProperty(Config.CADI_PROP_FILES);
+ if (cpf!=null){
+ for (String f : Split.split(File.pathSeparatorChar, cpf)) {
+ System.out.format("Reading %s\n",f);
+ FileInputStream fis = new FileInputStream(f);
+ try {
+ Properties props = new Properties();
+ props.load(fis);
+ for (Entry<Object, Object> prop : props.entrySet()) {
+ boolean lower = true;
+ String key = prop.getKey().toString();
+ for(int i=0;lower && i<key.length();++i) {
+ if(Character.isUpperCase(key.charAt(i))) {
+ lower = false;
+ }
+ }
+ if(lower) {
+ PropHolder ph = CRED_TAGS.contains(key)?cred:app;
+ if(key.endsWith("_password")) {
+ ph.addEnc(key, prop.getValue().toString());
+ } else {
+ ph.add(key, prop.getValue().toString());
+ }
+ }
+ }
+ } finally {
+ fis.close();
}
- } else if (acf.code()==401){
- trans.error().log("Bad Password sent to AAF");
- } else {
- trans.error().log(errMsg.toMsg(acf));
}
} else {
- String cpf = pa.getProperty(Config.CADI_PROP_FILES);
- if (cpf!=null){
- for (String f : Split.split(File.pathSeparatorChar, cpf)) {
- System.out.format("Reading %s\n",f);
- FileInputStream fis = new FileInputStream(f);
- try {
- Properties props = new Properties();
- props.load(fis);
- for (Entry<Object, Object> prop : props.entrySet()) {
- boolean lower = true;
- String key = prop.getKey().toString();
- for(int i=0;lower && i<key.length();++i) {
- if(Character.isUpperCase(key.charAt(i))) {
- lower = false;
- }
- }
- if(lower) {
- PropHolder ph = CRED_TAGS.contains(key)?cred:app;
- if(key.endsWith("_password")) {
- ph.addEnc(key, prop.getValue().toString());
- } else {
- ph.add(key, prop.getValue().toString());
- }
- }
- }
- } finally {
- fis.close();
+ aafcon = aafcon(propAccess);
+ if (aafcon!=null) { // get Properties from Remote AAF
+ final String locator = getProperty(propAccess,aafcon.env,false,Config.AAF_LOCATE_URL,"AAF Locator URL: ");
+
+ Future<Configuration> acf = aafcon.client(new SingleEndpointLocator(locator))
+ .read("/configure/"+fqi+"/aaf", configDF);
+ if (acf.get(TIMEOUT)) {
+ for (Props props : acf.value.getProps()) {
+ PropHolder ph = CRED_TAGS.contains(props.getTag())?cred:app;
+ if(props.getTag().endsWith("_password")) {
+ ph.addEnc(props.getTag(), props.getValue());
+ } else {
+ ph.add(props.getTag(), props.getValue());
+ }
}
+ } else if (acf.code()==401){
+ trans.error().log("Bad Password sent to AAF");
+ } else if (acf.code()==404){
+ trans.error().log("This version of AAF does not support remote Properties");
+ } else {
+ trans.error().log(errMsg.toMsg(acf));
}
}
}
appID=null;
}
- if (appID!=null && access.getProperty(Config.AAF_APPPASS)==null) {
- char[] password = cons.readPassword("Password for %s: ", appID);
- String app_pass = access.encrypt(new String(password));
- access.setProperty(Config.AAF_APPPASS,app_pass);
- diskprops.setProperty(Config.AAF_APPPASS, app_pass);
+ if (appID!=null) {
+ diskprops.setProperty(Config.AAF_APPID,appID);
+ if( access.getProperty(Config.AAF_APPPASS)==null) {
+ char[] password = cons.readPassword("Password for %s: ", appID);
+ if(password.length>0) {
+ String app_pass = access.encrypt(new String(password));
+ access.setProperty(Config.AAF_APPPASS,app_pass);
+ diskprops.setProperty(Config.AAF_APPPASS,app_pass);
+ }
+ }
}
String keystore=access.getProperty(Config.CADI_KEYSTORE);
addProp(Config.AAF_LOCATE_URL, locateUrl);
}
- final String apiVersion = access.getProperty(Config.AAF_API_VERSION);
+ final String apiVersion = access.getProperty(Config.AAF_API_VERSION, Config.AAF_DEFAULT_API_VERSION);
+ final String aaf_root_ns = access.getProperty(Config.AAF_ROOT_NS);
+ String locateRoot;
+ if(aaf_root_ns==null) {
+ locateRoot=Defaults.AAF_ROOT;
+ } else {
+ locateRoot = Defaults.AAF_LOCATE_CONST + '/' + aaf_root_ns;
+ }
if(access.getProperty(Config.AAF_URL)==null) {
- access.setProperty(Config.AAF_URL, apiVersion==null?Defaults.AAF_URL:Defaults.AAF_ROOT+".service:"+apiVersion);
+
+ access.setProperty(Config.AAF_URL, locateRoot+".service:"+apiVersion);
}
if(access.getProperty(Config.CM_URL)==null) {
- access.setProperty(Config.CM_URL, apiVersion==null?Defaults.CM_URL:Defaults.AAF_ROOT+".cm:"+apiVersion);
+ access.setProperty(Config.CM_URL, locateRoot+".cm:"+apiVersion);
}
String cadiLatitude = access.getProperty(Config.CADI_LATITUDE);
if (cadiLatitude==null) {
Code Review / aaf / authz.git / commitdiff