who said app integration est facilè. I did not.

Author: thsc42

libs/ASAPJava.jar

@@ -33,14 +33,14 @@
  * Only commands a user should be able to execute are used below.
  */
 public class ProductionUI {
-    public static final String SETTINGSFILENAME = ".sharkMessengerSettings";
+    public static final String SETTINGSFILENAME = ".sharkMessengerSessionSettings";
     public static final String PEERNAME_KEY = "peername";
     public static final String SYNC_WITH_OTHERS_IN_SECONDS_KEY = "syncWithOthersInSeconds";
 
     public static void main(String[] args) throws SharkException, IOException {
         String peerName = null;
         int syncWithOthersInSeconds = ASAPHubManager.DEFAULT_WAIT_INTERVAL_IN_SECONDS;
-        ExtraData settings = new ExtraDataFS("./" + SETTINGSFILENAME);
+        ExtraData sessionSettings = new ExtraDataFS("./" + SETTINGSFILENAME);
         boolean isBack = false;
 
         /**
@@ -74,7 +74,7 @@ public static void main(String[] args) throws SharkException, IOException {
 
         System.out.println("Welcome to SharkMessenger version 0.1");
         if(peerName == null) {
-            byte[] storedPeerNameBytes = settings.getExtra(PEERNAME_KEY);
+            byte[] storedPeerNameBytes = sessionSettings.getExtra(PEERNAME_KEY);
             if(storedPeerNameBytes != null) {
                 // we have a peer name
                 peerName = new String(storedPeerNameBytes);
@@ -96,10 +96,10 @@ public static void main(String[] args) throws SharkException, IOException {
                 }
             } while (peerName.equals(""));
             // store it
-            settings.putExtra(PEERNAME_KEY, peerName.getBytes());
+            sessionSettings.putExtra(PEERNAME_KEY, peerName.getBytes());
         }
 
-        settings.putExtra(SYNC_WITH_OTHERS_IN_SECONDS_KEY, syncWithOthersInSeconds);
+        sessionSettings.putExtra(SYNC_WITH_OTHERS_IN_SECONDS_KEY, syncWithOthersInSeconds);
 
         // Re-direct asap/shark log messages.
         PrintStream asapLogMessages = new PrintStream("asapLogs" + peerName + ".txt");
@@ -109,8 +109,9 @@ public static void main(String[] args) throws SharkException, IOException {
         if(isBack) System.out.println("Welcome back " + peerName);
         else System.out.println("Welcome " + peerName);
 
-        SharkMessengerApp sharkMessengerApp = new SharkMessengerApp(peerName, settings);
-        SharkMessengerUI smUI = new SharkMessengerUI("", System.in, System.out, System.err, sharkMessengerApp);
+        SharkMessengerUI smUI = new SharkMessengerUI("", System.in, System.out, System.err);
+        SharkMessengerApp sharkMessengerApp =
+                new SharkMessengerApp(peerName, syncWithOthersInSeconds, System.out, System.err);
 
         // basics
         smUI.addCommand(new UICommandExit(sharkMessengerApp, smUI, "exit", false));

libs/SharkPKI.jar

@@ -7,13 +7,11 @@
 import net.sharksystem.asap.*;
 import net.sharksystem.asap.apps.TCPServerSocketAcceptor;
 import net.sharksystem.asap.crypto.InMemoASAPKeyStore;
-import net.sharksystem.asap.persons.PersonValues;
 import net.sharksystem.asap.pki.ASAPCertificate;
-import net.sharksystem.asap.pki.ASAPKeyStorage;
-import net.sharksystem.asap.utils.ASAPSerialization;
 import net.sharksystem.asap.utils.DateTimeHelper;
 import net.sharksystem.asap.utils.PeerIDHelper;
 import net.sharksystem.fs.ExtraData;
+import net.sharksystem.fs.ExtraDataFS;
 import net.sharksystem.fs.FSUtils;
 import net.sharksystem.hub.HubConnectionManager;
 import net.sharksystem.hub.HubConnectionManagerImpl;
@@ -39,40 +37,61 @@ public class SharkMessengerApp implements SharkPeerEncounterChangedListener {
     private static final CharSequence PEER_ID_KEY = "peerIDKey";
     private final SharkPeerFS sharkPeerFS;
 
+    // keystore
+    private static final CharSequence KEYSTORE_MEMENTO_KEY = "keyStoreMemento";
+
     //private static final CharSequence ROOTFOLDER = "sharkMessengerDataStorage";
     private final SharkMessengerComponent messengerComponent;
     private final SharkPKIComponent pkiComponent;
     private final HubConnectionManager hubConnectionManager;
     private final ASAPEncounterManager encounterManager;
     private final ASAPEncounterManagerAdmin encounterManagerAdmin;
     private final String peerDataFolderName;
-    private final ExtraData settings;
+    private final ExtraData appSettings;
     private final String peerName;
     private PrintStream outStream;
     private PrintStream errStream;
     private CharSequence peerID;
 
-    public SharkMessengerApp(String peerName, ExtraData settings) throws SharkException, IOException {
+    public SharkMessengerApp(String peerName, PrintStream out, PrintStream err)
+            throws SharkException, IOException {
+        this(peerName, 60*10, out, err);
+    }
+
+    public SharkMessengerApp(String peerName, int syncWithOthersInSeconds, PrintStream out, PrintStream err)
+            throws SharkException, IOException {
+
         this.peerDataFolderName = "./" + peerName;
-        this.settings = settings;
+        this.appSettings = new ExtraDataFS(".", "SharkMessengerSetting" + peerName);
+        this.outStream = out;
+        this.errStream = err;
         this.sharkPeerFS = new SharkPeerFS(peerName, this.peerDataFolderName);
         this.peerName = peerName;
-        int syncWithOthersInSeconds = settings.getExtraInteger(SYNC_WITH_OTHERS_IN_SECONDS_KEY);
 
-        boolean saveNewPeerID = false;
         try {
-            byte[] peerIDBytes = this.sharkPeerFS.getExtra(PEER_ID_KEY);
-            this.peerID = ASAPSerialization.byteArray2String(peerIDBytes);
+            this.peerID = this.sharkPeerFS.getSharkPeerExtraData().getExtraString(PEER_ID_KEY);
+            this.tellUI("asap peer id for " + peerName + " is " + this.peerID);
         }
         catch (SharkException se) {
             this.peerID = peerName + "_" + PeerIDHelper.createUniqueID();
-            saveNewPeerID = true;
+            this.tellUI("created a new asap peer id for " + peerName + ": " + this.peerID);
+            this.sharkPeerFS.getSharkPeerExtraData().putExtra(PEER_ID_KEY, this.peerID);
         }
 
         // set up shark components
 
         // produce KeyStore
         InMemoASAPKeyStore keyStore = new InMemoASAPKeyStore(this.peerID);
+        keyStore.setMementoTarget(this.appSettings, KEYSTORE_MEMENTO_KEY);
+        try {
+            keyStore.restoreFromMemento(this.appSettings.getExtra(KEYSTORE_MEMENTO_KEY));
+            this.tellUI("restored keystore from memento");
+        }
+        catch(SharkException se) {
+            // no memento for key store - must be new
+            this.tellUI("no keystore memento - must be new");
+        }
+
         // get PKI factory
         SharkPKIComponentFactory pkiComponentFactory = new SharkPKIComponentFactory(keyStore);
 
@@ -88,7 +107,6 @@ public SharkMessengerApp(String peerName, ExtraData settings) throws SharkExcept
 
         // all component in place - start peer
         this.sharkPeerFS.start(this.peerID);
-        if(saveNewPeerID) this.sharkPeerFS.putExtra(PEER_ID_KEY, ASAPSerialization.string2byteArray(peerID));
 
         // get component to add listener
         this.messengerComponent = (SharkMessengerComponent) this.sharkPeerFS.
@@ -147,7 +165,7 @@ public SharkPKIComponent getSharkPKIComponent() {
 
     public void destroyAllData() throws SharkException, IOException {
         FSUtils.removeFolder(this.peerDataFolderName);
-        this.settings.removeAll();
+        this.appSettings.removeAll();
     }
 
     public String getPeerName() {

libs/SharkPeer.jar

@@ -25,24 +25,22 @@ public class SharkMessengerUI {
     /**
      * Use for string input in unittests or no input
      */
-    public SharkMessengerUI(String batchCommands, InputStream is, PrintStream out, PrintStream err,
-                            SharkMessengerApp sharkMessengerApp) {
+    public SharkMessengerUI(
+            String batchCommands, InputStream is, PrintStream out, PrintStream err) {
         this.parsedCommands.addAll(Arrays.asList(batchCommands.trim().split(System.lineSeparator())));
         this.outStream = out;
         this.errStream = err;
         this.bufferedReader = new BufferedReader(new InputStreamReader(is));
-        sharkMessengerApp.setUIStreams(this.outStream, this.errStream);
     }
 
     /**
      * Use for text file as batch input
      *
      * @throws FileNotFoundException
      */
-    public SharkMessengerUI(File file, InputStream is, PrintStream out, PrintStream err,
-                            SharkMessengerApp sharkMessengerApp) throws FileNotFoundException {
+    public SharkMessengerUI(File file, InputStream is, PrintStream out, PrintStream err) throws FileNotFoundException {
         this(new BufferedReader(new InputStreamReader(new FileInputStream(file)))
-                .lines().reduce("", (a, b) -> a + System.lineSeparator() + b), is, out, err, sharkMessengerApp
+                .lines().reduce("", (a, b) -> a + System.lineSeparator() + b), is, out, err
         );
     }
 

src/net/sharksystem/cmdline/sharkmessengerUI/ProductionUI.java

@@ -4,7 +4,9 @@
 import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.utils.DateTimeHelper;
 import net.sharksystem.cmdline.sharkmessengerUI.SharkMessengerApp;
+import net.sharksystem.cmdline.sharkmessengerUI.commands.pki.PKIPrinter;
 import net.sharksystem.messenger.*;
+import net.sharksystem.pki.SharkPKIComponent;
 import net.sharksystem.utils.SerializationHelper;
 
 import java.io.IOException;
@@ -68,7 +70,7 @@ private String returnYesNo(boolean value) {
     }
 
     private static final String CHANNEL_PRINTER_LINE_SEPARATOR = "\n--------------------------------------------------------------------------------\n";
-    public String getMessagesASString(String channelUri, SharkMessageList messages)
+    public String getMessagesASString(SharkPKIComponent pki, String channelUri, SharkMessageList messages)
             throws IOException, SharkMessengerException, ASAPException {
 
         StringBuilder sb = new StringBuilder();
@@ -84,14 +86,14 @@ public String getMessagesASString(String channelUri, SharkMessageList messages)
                 sb.append("#" + i);
                 sb.append(CHANNEL_PRINTER_LINE_SEPARATOR);
                 SharkMessage message = messages.getSharkMessage(i, true);
-                sb.append(this.getMessageDetails(message));
+                sb.append(this.getMessageDetails(pki, message));
                 sb.append(CHANNEL_PRINTER_LINE_SEPARATOR);
             }
         }
         return sb.toString();
     }
 
-    public String getMessageDetails(SharkMessage message)
+    public String getMessageDetails(SharkPKIComponent pki, SharkMessage message)
             throws IOException, ASAPException {
 
         StringBuilder sb = new StringBuilder();
@@ -139,6 +141,10 @@ public String getMessageDetails(SharkMessage message)
         if (message.signed()) {
             sb.append(" | verified: ");
             sb.append(this.returnYesNo(message.verified()));
+            if(message.verified()) {
+                sb.append(" | ");
+                sb.append(new PKIPrinter(pki).getIAString(message.getSender()));
+            }
         }
 
         // hoping list

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerApp.java

@@ -0,0 +1,41 @@
+package net.sharksystem.cmdline.sharkmessengerUI.commands.pki;
+
+import net.sharksystem.asap.ASAPSecurityException;
+import net.sharksystem.pki.SharkPKIComponent;
+
+public class PKIPrinter {
+    private final SharkPKIComponent pki;
+
+    public PKIPrinter(SharkPKIComponent pki) {
+        this.pki = pki;
+    }
+
+    public String getIAString(CharSequence peerID) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("ia (");
+        sb.append(peerID);
+        sb.append("): ");
+
+        int ia = 0;
+        try {
+            ia = pki.getPersonValuesByID(peerID).getIdentityAssurance();
+        } catch (ASAPSecurityException e) {
+            // nothing found
+            // is it you
+            if(pki.getOwnerID().equals(peerID)) {
+                ia = 10;
+            }
+        }
+        sb.append(ia);
+        sb.append(" (");
+        if(ia == 0) sb.append("bad");
+        else if(ia == 10) sb.append("perfect");
+        else if(ia == 9) sb.append("good");
+        else if(ia > 6) sb.append("nice");
+        else if(ia < 4) sb.append("bad");
+        else sb.append("enough?");
+        sb.append(") ");
+
+        return sb.toString();
+    }
+}

src/net/sharksystem/cmdline/sharkmessengerUI/SharkMessengerUI.java

@@ -30,7 +30,14 @@ public void execute() throws Exception {
         try {
             int channelIndex = this.getIntegerArgument() - 1; // we start with 1 in UI and 0 inside
             SharkMessengerComponent messenger = this.getSharkMessengerApp().getSharkMessengerComponent();
-            SharkMessengerChannel channel = messenger.getChannel(channelIndex);
+            SharkMessengerChannel channel = null;
+            try {
+                channel = messenger.getChannel(channelIndex);
+            }
+            catch (SharkException se) {
+                this.getSharkMessengerApp().tellUI("there is no channel at all (yet)");
+            }
+
             SharkMessageList messages = channel.getMessages();
             if(messages == null || messages.size() <1) {
                 this.getSharkMessengerApp().tellUI("no messages in channel " + channelIndex);
@@ -40,7 +47,9 @@ public void execute() throws Exception {
             this.getSharkMessengerApp().tellUI(channelPrinter.getChannelDescription(channel));
 
             this.getSharkMessengerApp().tellUI(
-                    channelPrinter.getMessagesASString(channel.getURI().toString(), messages));
+                    channelPrinter.getMessagesASString(
+                            this.getSharkMessengerApp().getSharkPKIComponent(),
+                            channel.getURI().toString(), messages));
         } catch (SharkException | IOException e) {
             this.printErrorMessage(e.getLocalizedMessage());
         }

src/net/sharksystem/cmdline/sharkmessengerUI/commands/extendedMessenger/ChannelPrinter.java

@@ -79,7 +79,7 @@ private ExtraData getBobSettings() throws SharkException, IOException {
     private SharkMessengerUI initializeSharkMessengerUI(SharkMessengerApp sharkMessengerApp, String batchCommands)
             throws SharkException, IOException {
 
-        SharkMessengerUI smUI = new SharkMessengerUI(batchCommands, System.in, System.out, System.err, sharkMessengerApp);
+        SharkMessengerUI smUI = new SharkMessengerUI(batchCommands, System.in, System.out, System.err);
 
         // Add test received listener.
         sharkMessengerApp.getSharkMessengerComponent().addSharkMessagesReceivedListener(
@@ -156,8 +156,8 @@ public void reconstructIncomingChunkStorageBugLinux() throws Exception {
                 System.lineSeparator() +
                 "mkChannel test://t1 channel1 false";
 
-        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, getAliceSettings());
-        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, getBobSettings());
+        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, System.out, System.err);
+        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, System.out, System.err);
         SharkMessengerUI smUIAlice = this.initializeSharkMessengerUI(smaAlice, cmdLogAlice);
         SharkMessengerUI smUIBob = this.initializeSharkMessengerUI(smaBob, cmdLogBob);
 
@@ -188,8 +188,8 @@ public void reconstructIncomingChunkStorageBugLinuxAlternatingExecution() throws
         String cmdBob4th = "mkChannel test://t1 channel1 false";
         String cmdAlice5th = "sendMessage 0 false false hi_bob bob";
 
-        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, getAliceSettings());
-        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, getBobSettings());
+        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, System.out, System.err);
+        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, System.out, System.err);
         SharkMessengerUI smUIAlice = this.initializeSharkMessengerUI(smaAlice, "");
         SharkMessengerUI smUIBob = this.initializeSharkMessengerUI(smaBob, "");
 
@@ -238,8 +238,8 @@ public void reconstructThreadBugFromTests060324() throws Exception {
         String cmdBob4th = "mkChannel test://t1 channel1 false";
         String cmdAlice5th = "sendMessageTest 25 30 0 false false hi_bob bob";
 
-        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, getAliceSettings());
-        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, getBobSettings());
+        SharkMessengerApp smaAlice = new SharkMessengerApp(ALICE, System.out, System.err);
+        SharkMessengerApp smaBob = new SharkMessengerApp(BOB, System.out, System.err);
         SharkMessengerUI smUIAlice = this.initializeSharkMessengerUI(smaAlice, "");
         SharkMessengerUI smUIBob = this.initializeSharkMessengerUI(smaBob, "");