From 98adb75e5e627d28ecdf659f4c8ed640ce53ed5e Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 31 May 2019 10:02:47 -0500 Subject: Update DNSLocator code and use Issue-ID: AAF-838 Change-Id: Ieaf112365e40237b6f252371d2d2f95e9bc47f89 Signed-off-by: Instrumental --- .../main/java/org/onap/aaf/auth/cmd/ns/List.java | 3 +- .../main/java/org/onap/aaf/auth/cmd/user/ID.java | 125 +++++++++++++++++++++ .../main/java/org/onap/aaf/auth/cmd/user/User.java | 1 + 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/ID.java (limited to 'auth/auth-cmd') diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java index 3dae0fa5..42306c85 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/ns/List.java @@ -163,8 +163,9 @@ public class List extends BaseCmd { type = 9999; } switch(type) { + case 0: return "NoCrd"; case 1: return "U/P"; - case 2: return "U/P2"; + case 2: return "U/P2"; case 10: return "Cert"; case 200: return "x509"; default: diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/ID.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/ID.java new file mode 100644 index 00000000..12035a16 --- /dev/null +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/ID.java @@ -0,0 +1,125 @@ +/** + * ============LICENSE_START==================================================== + * org.onap.aaf + * =========================================================================== + * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END==================================================== + * + */ + +package org.onap.aaf.auth.cmd.user; + +import org.onap.aaf.auth.cmd.AAFcli; +import org.onap.aaf.auth.cmd.Cmd; +import org.onap.aaf.auth.cmd.Param; +import org.onap.aaf.auth.rserv.HttpMethods; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.misc.env.APIException; + +import aaf.v2_0.CredRequest; + +public class ID extends Cmd { + public static final String ATTEMPT_FAILED_SPECIFICS_WITHELD = "Attempt Failed. Specifics witheld."; + private static final String CRED_PATH = "/authn/cred"; + private static final String[] options = {"add","del"}; + public ID(User parent) { + super(parent,"fqi", + new Param(optionsToString(options),true), + new Param("id",true) + ); + } + + @Override + public int _exec(int _idx, final String ... args) throws CadiException, APIException, LocatorException { + int idx = _idx; + String key = args[idx++]; + final int option = whichOption(options,key); + + final CredRequest cr = new CredRequest(); + cr.setId(args[idx++]); + cr.setType(0); + if (args.length>idx) + cr.setEntry(args[idx]); + + // Set Start/End commands + setStartEnd(cr); + Integer ret = same(new Retryable() { + @Override + public Integer code(Rcli client) throws CadiException, APIException { + Future fp=null; + String verb =null; + switch(option) { + case 0: + fp = client.create( + CRED_PATH, + getDF(CredRequest.class), + cr + ); + verb = "Added ID ["; + break; + case 1: + setQueryParamsOn(client); + fp = client.delete(CRED_PATH, + getDF(CredRequest.class), + cr + ); + verb = "Deleted ID ["; + break; + default: + break; + } + if (fp==null) { + return null; // get by Sonar check. + } + if (fp.get(AAFcli.timeout())) { + pw().print(verb); + pw().print(cr.getId()); + pw().println(']'); + } else if (fp.code()==202) { + pw().println("ID Action Accepted, but requires Approvals before actualizing"); + } else if (fp.code()==406 && option==1) { + pw().println("You cannot delete this ID"); + } else { + pw().println(ATTEMPT_FAILED_SPECIFICS_WITHELD); + } + return fp.code(); + } + }); + if (ret==null)ret = -1; + return ret; + } + + @Override + public void detailedHelp(int _indent, StringBuilder sb) { + int indent = _indent; + detailLine(sb,indent,"Add or Delete Fully Qualified Identity: An ID attached to the Namespace"); + indent+=2; + detailLine(sb,indent,"fqi - the ID to create/delete within AAF"); + sb.append('\n'); + detailLine(sb,indent,"This usage has NO Credential, and serves only to allow IDs to be attached"); + detailLine(sb,indent,"to Roles before credentials such as Certificates are established."); + detailLine(sb,indent,"The Domain can be related to any Namespace you have access to *"); + detailLine(sb,indent,"The Domain is in reverse order of Namespace, i.e. "); + detailLine(sb,indent+2,"NS of com.att.myapp can create user of XY1234@myapp.att.com"); + indent-=2; + api(sb,indent,HttpMethods.POST,"authn/cred",CredRequest.class,true); + api(sb,indent,HttpMethods.DELETE,"authn/cred",CredRequest.class,false); + api(sb,indent,HttpMethods.PUT,"authn/cred",CredRequest.class,false); + } +} diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/User.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/User.java index 26e35bec..746f9c22 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/User.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/user/User.java @@ -29,6 +29,7 @@ public class User extends BaseCmd { public User(AAFcli aafcli) throws APIException { super(aafcli,"user"); cmds.add(new Role(this)); + cmds.add(new ID(this)); cmds.add(new Cred(this)); cmds.add(new Delg(this)); cmds.add(new List(this)); -- cgit 1.2.3-korg