Rename of classes

Author: gaynor@illinois.edu

.idea/artifacts/unnamed.xml

@@ -49,7 +49,7 @@
         <module>util</module>
         <module>servlet</module>
         <module>storage</module>
-        <module>sat-server</module>
+        <module>sas-server</module>
     </modules>
     <build>
         <plugins>

.idea/compiler.xml

@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sat-server</artifactId>
-
-    <packaging>war</packaging>
+    <artifactId>sas-server</artifactId>
+    <name>Secure API Service</name>
+    <!--<packaging>war</packaging>-->
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

.idea/encodings.xml

@@ -1,4 +1,4 @@
-package edu.uiuc.ncsa.sat;
+package edu.uiuc.ncsa.sas;
 
 import edu.uiuc.ncsa.security.core.Identifier;
 import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
@@ -12,7 +12,6 @@
 import edu.uiuc.ncsa.security.util.crypto.KeyUtil;
 import edu.uiuc.ncsa.security.util.jwk.JSONWebKey;
 import edu.uiuc.ncsa.security.util.jwk.JSONWebKeyUtil;
-import edu.uiuc.ncsa.security.util.jwk.JSONWebKeys;
 import edu.uiuc.ncsa.security.util.ssl.SSLConfiguration;
 import net.sf.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
@@ -36,7 +35,7 @@
  * <p>Created by Jeff Gaynor<br>
  * on 8/18/22 at  3:14 PM
  */
-public class Client extends ServiceClient implements SATConstants {
+public class Client extends ServiceClient implements SASConstants {
 
     public Client(URI address, SSLConfiguration sslConfiguration) {
         super(address, sslConfiguration);
@@ -46,7 +45,7 @@ public Client(URI address) {
         super(address);
     }
 
-    public static final String FLAG_NEW = "-edit";
+    public static final String FLAG_EDIT = "-edit";
     public static final String FLAG_CONFIG = "-cfg"; // name of config file
     public static final String FLAG_HELP = "--help"; // help
     public static final String FLAG_VERBOSE = "-v"; // help
@@ -74,6 +73,7 @@ public static void say(Object x) {
 
     /**
      * Read a single line
+     *
      * @return
      * @throws IOException
      */
@@ -106,6 +106,7 @@ protected static XMLMap readConfig(String fileName) throws IOException {
         return map;
     }
 
+
     /*
          -cfg path.properties is config
          -type is type.
@@ -116,7 +117,7 @@ protected static void createConfig(String filename) throws IOException {
         xmlMap.put(CONFIG_CLIENT_ID, getInput("enter client id"));
         say("enter private key, PKCS 8 or a single JWK");
         String x = multiLineInput("", CONFIG_PRIVATE_KEY);
-        xmlMap.put(CONFIG_PRIVATE_KEY, x);
+        xmlMap.put(CONFIG_PRIVATE_KEY, x.trim()); // If a JWK, any leading blanks will cause JSON library to fail.
         xmlMap.put(CONFIG_HOST, getInput("enter server address"));
 
         if ("y".equals(getInput("enter ssl configuration (y/n)?"))) {
@@ -142,48 +143,36 @@ protected static void createConfig(String filename) throws IOException {
         }
     }
 
-    /*
-            SSLConfiguration sslConfiguration = new SSLConfiguration();
-        sslConfiguration.setTrustRootPath("/home/ncsa/certs/localhost-2020.jks");
-        sslConfiguration.setTrustRootPassword("vnlH814i");
-        sslConfiguration.setTrustRootType("JKS");
-        sslConfiguration.setTrustRootCertDN("CN=localhost");
-        sslConfiguration.setUseDefaultTrustManager(false);
-
-        Client client = new Client(URI.create("https://localhost:9443/sat-server/sat"), sslConfiguration);
-        JSONWebKeys keys = JSONWebKeyUtil.fromJSON(new File("/home/ncsa/dev/ncsa-git/security-lib/crypto/src/main/resources/keys.jwk"));
-        keys.setDefaultKeyID("2D700DF531E09B455B9E74D018F9A133"); // for testing!
-        client.setKeys(keys);
-        client.doLogon(BasicIdentifier.newID("sat:client/debug_client"));
-        client.doExecute("w00f!");
-        client.doLogoff();
 
-     */
     public static void main(String[] args) throws Throwable {
-        JSONWebKeys keys = JSONWebKeyUtil.fromJSON(new File("/home/ncsa/dev/ncsa-git/security-lib/crypto/src/main/resources/keys.jwk"));
-        keys.setDefaultKeyID("2D700DF531E09B455B9E74D018F9A133"); // for testing!
-        System.out.println(JSONWebKeyUtil.toJSON(keys));
         Vector<String> vector = new Vector<>();
         vector.add("dummy"); // Dummy zero-th arg.
         for (String arg : args) {
             vector.add(arg);
         }
         InputLine inputLine = new InputLine(vector); // now we have a bunch of utilities for this
-
+        if (inputLine.hasArg(FLAG_HELP)) {
+            showHelp();
+            return;
+        }
         boolean isVerbose = inputLine.hasArg(FLAG_VERBOSE);
+        if (inputLine.hasArg(FLAG_EDIT)) {
+            if (inputLine.hasArg(FLAG_CONFIG)) {
+                File f = new File(inputLine.getNextArgFor(FLAG_CONFIG));
+                if (!f.exists()) {
+                    if ("y".equals(getInput("Create a new configuration?"))) {
+                        createConfig(f.getAbsolutePath());
+                        return;
+                    }
+                }
+            }
 
+        }
         if (!inputLine.hasArg(FLAG_CONFIG)) {
-            if ("y".equals(getInput("Create a new configuration?"))) {
-                createConfig(null);
-                return;
-            }
             say("No configuration. exiting...");
         }
 
-        if (inputLine.hasArg(FLAG_HELP)) {
-            showHelp();
-            return;
-        }
+
         XMLMap config;
         if (inputLine.hasArg(FLAG_CONFIG)) {
             try {
@@ -200,15 +189,16 @@ public static void main(String[] args) throws Throwable {
             return;
         }
 
+
         SSLConfiguration sslConfiguration = new SSLConfiguration();
         sslConfiguration.setTrustRootPath(config.getString(CONFIG_TR_FILE));
         sslConfiguration.setTrustRootPassword(config.getString(CONFIG_TR_PASSWORD));
         sslConfiguration.setTrustRootType(config.getString(CONFIG_TR_TYPE));
         sslConfiguration.setTrustRootCertDN(config.getString(CONFIG_TR_DN));
         sslConfiguration.setUseDefaultTrustManager(false);
 
-        //Client client = new Client(URI.create("https://localhost:9443/sat-server/sat"), sslConfiguration);
         Client client = new Client(URI.create(config.getString(CONFIG_HOST)), sslConfiguration);
+        client.setConfig(config);
         String rawKey = config.getString(CONFIG_PRIVATE_KEY);
         PrivateKey privateKey = null;
         try {
@@ -224,14 +214,48 @@ public static void main(String[] args) throws Throwable {
             return;
         }
         client.setPrivateKey(privateKey);
-        client.doLogon(BasicIdentifier.newID(config.getString(CONFIG_CLIENT_ID)));
-        //client.doLogon(BasicIdentifier.newID("sat:client/debug_client"));
-        client.doExecute("w00f!");
-        client.doLogoff();
+        client.repl();
+    }
+
+    public XMLMap getConfig() {
+        return config;
+    }
+
+    public void setConfig(XMLMap config) {
+        this.config = config;
+    }
+
+    XMLMap config;
+
+    protected void repl() throws Throwable {
+        boolean doIt = true;
+        while (doIt) {
+            String lineIne = getInput("sas");
+            switch (lineIne) {
+                case "/q":
+                    return;
+                case "/logon":
+                    doLogon(BasicIdentifier.newID(getConfig().getString(CONFIG_CLIENT_ID)));
+                    say("login complete");
+                    break;
+                case "/logoff":
+                    doLogoff();
+                    say("logged off..");
+                    break;
+                default:
+                    doExecute(lineIne);
+                    break;
+            }
+        }
     }
 
     private static void showHelp() {
-        say("Help for " + Client.class.getName());
+        say(Client.class.getName() + " " + FLAG_CONFIG + " config_file {" + FLAG_EDIT + "} {" + FLAG_HELP + "} {" + FLAG_VERBOSE + "}");
+        say(FLAG_CONFIG + " the name of an existing configuration file ");
+        say(FLAG_EDIT + " edit existing file or update current ");
+        say(FLAG_HELP + " display this help message ");
+        say(FLAG_VERBOSE + " print more output about functioning of this. Mostly for debugging.");
+        say("If you simply supply the " + FLAG_EDIT + " flag, you will be prompted to create a new configuration file.");
     }
 
     UUID sessionID;
@@ -260,7 +284,7 @@ protected void doLogoff() throws Throwable {
         JSONObject sat = new JSONObject();
 
         sat.put(KEYS_ACTION, ACTION_LOGOFF);
-        top.put(SATConstants.KEYS_SAT, sat);
+        top.put(SASConstants.KEYS_SAT, sat);
         String raw = doPost(top.toString());
         String jj = sDecrypt(raw);
         System.out.println(jj);

.idea/misc.xml

@@ -1,4 +1,4 @@
-package edu.uiuc.ncsa.sat;
+package edu.uiuc.ncsa.sas;
 
 import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
 

.idea/workspace.xml

@@ -1,6 +1,6 @@
-package edu.uiuc.ncsa.sat;
+package edu.uiuc.ncsa.sas;
 
-import edu.uiuc.ncsa.sat.thing.Action;
+import edu.uiuc.ncsa.sas.thing.Action;
 import edu.uiuc.ncsa.security.util.cli.IOInterface;
 
 /**