about adding cryptography

Author: thsc42

src/net/sharksystem/asap/ASAPEngine.java

@@ -378,7 +378,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
                               InputStream is, OutputStream os, ASAPChunkReceivedListener listener)
             throws ASAPException, IOException {
 
-        String sender = asapAssimiliationPDU.getPeer();
+        String sender = asapAssimiliationPDU.getSender();
         int eraSender = asapAssimiliationPDU.getEra();
 
         //<<<<<<<<<<<<<<<<<<debug
@@ -514,7 +514,7 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
             throws ASAPException, IOException {
 
         // get remote peer
-        String peer = asapInterest.getPeer();
+        String peer = asapInterest.getSender();
 
         //<<<<<<<<<<<<<<<<<<debug
         StringBuilder b = new StringBuilder();

src/net/sharksystem/asap/protocol/ASAPPersistentConnection.java

@@ -217,7 +217,7 @@ public void run() {
             /////////////////////////////// process
             if(asappdu != null) {
                 System.out.println(this.getLogStart() + "read valid pdu");
-                this.setRemotePeer(asappdu.getPeer());
+                this.setRemotePeer(asappdu.getSender());
 
                 try {
                     this.executor = new ASAPPDUExecutor(asappdu,

src/net/sharksystem/asap/protocol/ASAP_1_0.java

@@ -12,10 +12,14 @@
  * Descriptions of ASAP protocol data units and some constants
  */
 public interface ASAP_1_0 {
-    byte OFFER_CMD = 'O';
-    byte INTEREST_CMD = 'I';
-    byte ASSIMILATE_CMD = 'A';
-    String ANY_FORMAT = "any_asap";
+    int CMD_MASK = 0x6; // 0110
+    byte OFFER_CMD = 0;
+    byte INTEREST_CMD = 2;
+    byte ASSIMILATE_CMD = 4;
+
+    int ENCRYPTED_MASK = 0x1; // 0001
+    byte ENCRYPTED_CMD = 1;
+    String ANY_FORMAT = "ASAP_ANY_FORMAT";
     String ASAP_MANAGEMENT_FORMAT = "asap/control";
     int ERA_NOT_DEFINED = -1;
 
@@ -38,15 +42,15 @@ void offer(CharSequence peer, CharSequence format, CharSequence channel, int era
             throws IOException, ASAPException;
 
     /**
-     * @param peer identifies a peer - can be null
+     * @param recipient identifies a peer - can be null
      * @param channel describes a channel (can be null)
      * @param format describes format - used to describe an application that can deal with transmitted data format.
      * @param os stream that PDU is to be sent
      * @param signed message is signed
      * @throws IOException exception during writing on stream
      * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
      */
-    void offer(CharSequence peer, CharSequence format, CharSequence channel, OutputStream os, boolean signed)
+    void offer(CharSequence recipient, CharSequence format, CharSequence channel, OutputStream os, boolean signed)
             throws IOException, ASAPException;
 
     /*
@@ -55,8 +59,8 @@ void offer(CharSequence peer, CharSequence format, CharSequence channel, OutputS
     */
 
     /**
-     * @param peer identifies a peer - can be null
-     * @param sourcePeer wished source (authority) of information (optional, can be null)
+     * @param sender identifies sender - can be null
+     * @param recipient can be null - no restriction - any encountered peer will get it.
      * @param eraFrom lower limit of era range (-1 means undefined)
      * @param eraTo upper limit of era range (-1 means undefined)
      * @param channel whished / required channel (can be null)
@@ -66,13 +70,26 @@ void offer(CharSequence peer, CharSequence format, CharSequence channel, OutputS
      * @throws IOException exception during writing on stream
      * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
      */
-    void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
+    void interest(CharSequence sender, CharSequence recipient, CharSequence format,
                   CharSequence channel, int eraFrom, int eraTo,
                   OutputStream os, boolean signed) throws IOException, ASAPException;
 
+
     /**
-     * @param peer identifies a peer - can be null
-     * @param sourcePeer wished source (authority) of information (optional, can be null)
+     * @param sender identifies sender - can be null
+     * @param recipient can be null - no restriction - any encountered peer will get it.
+     * @param channel whished / required channel (can be null)
+     * @param format describes format - used to describe an application that can deal with transmitted data format.
+     * @param os stream that PDU is to be sent
+     * @throws IOException exception during writing on stream
+     * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
+     */
+    void interest(CharSequence sender, CharSequence recipient, CharSequence format,
+                  CharSequence channel, OutputStream os) throws IOException, ASAPException;
+
+    /**
+     * @param sender identifies sender - can be null
+     * @param recipient can be null - no restriction - any encountered peer will get it.
      * @param eraFrom lower limit of era range (-1 means undefined)
      * @param eraTo upper limit of era range (-1 means undefined)
      * @param channel whished / required channel (can be null)
@@ -85,22 +102,23 @@ void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
      * @throws IOException
      * @throws ASAPException
      */
-    void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
+    void interest(CharSequence sender, CharSequence recipient, CharSequence format,
                   CharSequence channel, int eraFrom, int eraTo,
                   OutputStream os, boolean sign, boolean encrypted, boolean mustBeEncrypted)
             throws IOException, ASAPException, ASAPSecurityException;
 
     /**
-     * @param peer wished source (authority) of information
+     * @param sender identifies sender - can be null
      * @param channel whished / required channel (can be null)
      * @param format describes format - used to describe an application that can deal with transmitted data format.
      * @param os stream that PDU is to be sent
      * @param signed message is signed
      * @throws IOException exception during writing on stream
      * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
      */
-    void interest(CharSequence peer, CharSequence format, CharSequence sourcePeer, CharSequence channel,
-                  OutputStream os, boolean signed) throws IOException, ASAPException;
+    void interest(CharSequence sender, CharSequence format, CharSequence sourcePeer,
+                  CharSequence channel, OutputStream os, boolean signed, boolean encrypted,
+                  boolean mustBeEncrypted) throws IOException, ASAPException;
 
     /*
     ASSIMILATE: Peer (optional) issues data (mandatory) to a channel (mandatory) in a format (mandatory) of a
@@ -109,8 +127,8 @@ void interest(CharSequence peer, CharSequence format, CharSequence sourcePeer, C
 
     /**
      *
-     * @param peer sender (optional, can be null)
-     * @param recipientPeer wished recipient (optional, can be null)
+     * @param sender sender (optional, can be null)
+     * @param recipient wished recipient (optional, can be null)
      * @param channelUri mandatory
      * @param format mandatory
      * @param offsets applications will probably store a number of messages in a data block. This (optional) list
@@ -121,14 +139,14 @@ void interest(CharSequence peer, CharSequence format, CharSequence sourcePeer, C
      * @throws IOException exception during writing on stream
      * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
      */
-    void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence format, CharSequence channelUri, int era,
+    void assimilate(CharSequence sender, CharSequence recipient, CharSequence format, CharSequence channelUri, int era,
                     long length, List<Long> offsets, InputStream dataIS, OutputStream os, boolean signed)
             throws IOException, ASAPException;
 
     /**
      *
-     * @param peer sender (optional, can be null)
-     * @param recipientPeer wished recipient (optional, can be null)
+     * @param sender sender (optional, can be null)
+     * @param recipient wished recipient (optional, can be null)
      * @param channel mandatory
      * @param format mandatory
      * @param offsets applications will probably store a number of messages in a data block. This (optional) list
@@ -139,7 +157,7 @@ void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence form
      * @throws IOException exception during writing on stream
      * @throws ASAPException protocol exception: mandatory parameter missing, invalid combination of parameters, ..
      */
-    void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence format, CharSequence channel, int era,
+    void assimilate(CharSequence sender, CharSequence recipient, CharSequence format, CharSequence channel, int era,
                     List<Long> offsets, byte[] data, OutputStream os, boolean signed)
             throws IOException, ASAPException;
 

src/net/sharksystem/asap/protocol/ASAP_AssimilationPDU_1_0.java

@@ -6,8 +6,6 @@
 import java.util.List;
 
 public interface ASAP_AssimilationPDU_1_0 extends ASAP_PDU_1_0 {
-    boolean recipientPeerSet();
-
     String getRecipientPeer();
 
     byte[] getData() throws IOException;

src/net/sharksystem/asap/protocol/ASAP_Interest_PDU_1_0.java

@@ -1,11 +1,8 @@
 package net.sharksystem.asap.protocol;
 
 public interface ASAP_Interest_PDU_1_0 extends ASAP_PDU_1_0 {
-    boolean sourcePeerSet();
     boolean eraFromSet();
     boolean eraToSet();
-
-    String getSourcePeer();
     int getEraFrom();
     int getEraTo();
 }

src/net/sharksystem/asap/protocol/ASAP_Modem_Impl.java

@@ -19,77 +19,93 @@ public ASAP_Modem_Impl() {
     public ASAP_Modem_Impl(ASAPSignAndEncryptionKeyStorage signAndEncryptionKeyStorage) {
         this.signAndEncryptionKeyStorage = signAndEncryptionKeyStorage;
     }
-    // Character are transmitted as bytes: number of bytes (first byte), content following, 0 mean no content
-
 
+    // Character are transmitted as bytes: number of bytes (first byte), content following, 0 mean no content
     /*
-    general structure:
+    general structure (asap message)
+    a) no encryption
     CMD | FLAGS | ... specifics
-     */
+
+    b) encryption
+    CMD | algorithm | recipient | encrypted message len | encrypted FLAGS | ... specifics
+    */
 
     @Override
     public void offer(CharSequence peer, CharSequence format, CharSequence channel, int era,
                       OutputStream os, boolean signed) throws IOException, ASAPException {
-
-        if(era < 0) throw new ASAPException("era must be a non-negative value: " + era);
         OfferPDU_Impl.sendPDU(peer, format, channel, era, os, signed);
     }
 
     @Override
-    public void offer(CharSequence peer, CharSequence format, CharSequence channel,
+    public void offer(CharSequence recipient, CharSequence format, CharSequence channel,
                       OutputStream os, boolean signed) throws IOException, ASAPException {
-        this.offer(peer, format, channel, 0, os, signed);
+        this.offer(recipient, format, channel, ERA_NOT_DEFINED, os, signed);
     }
 
     @Override
-    public void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
-                         CharSequence channel, OutputStream os, boolean signed) throws IOException, ASAPException {
+    public void interest(CharSequence sender, CharSequence recipient, CharSequence format,
+                         CharSequence channel, OutputStream os, boolean signed,
+                         boolean encryted, boolean mustBeEncrypted) throws IOException, ASAPException {
 
-        this.interest(peer, sourcePeer, format, channel, ERA_NOT_DEFINED, ERA_NOT_DEFINED, os, signed);
+        this.interest(sender, recipient, format, channel, ERA_NOT_DEFINED, ERA_NOT_DEFINED, os,
+                signed, encryted, mustBeEncrypted);
     }
 
     @Override
-    public void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
+    public void interest(CharSequence sender, CharSequence recipient, CharSequence format,
+                         CharSequence channel, OutputStream os) throws IOException, ASAPException {
+
+        this.interest(sender, recipient, format, channel, os, false, false, false);
+    }
+
+    @Override
+    public void interest(CharSequence sender, CharSequence recipient, CharSequence format,
              CharSequence channel, int eraFrom, int eraTo, OutputStream os, boolean signed)
             throws IOException, ASAPException {
 
-        this.interest(peer, sourcePeer, format, channel, eraFrom, eraTo, os,
+        this.interest(sender, recipient, format, channel, eraFrom, eraTo, os,
                 signed, false, false);
     }
 
     @Override
-    public void interest(CharSequence peer, CharSequence sourcePeer, CharSequence format,
+    public void interest(CharSequence sender, CharSequence recipient, CharSequence format,
             CharSequence channel, int eraFrom, int eraTo, OutputStream os, boolean signed,
                          boolean encryted, boolean mustBeEncrypted)
             throws IOException, ASAPException, ASAPSecurityException {
 
-        InterestPDU_Impl.sendPDU(peer, sourcePeer, format, channel, eraFrom, eraTo, os,
+        InterestPDU_Impl.sendPDU(sender, recipient, format, channel, eraFrom, eraTo, os,
                 signed, encryted, mustBeEncrypted, this.signAndEncryptionKeyStorage);
     }
 
     @Override
-    public void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence format,
+    public void assimilate(CharSequence sender, CharSequence recipient, CharSequence format,
                            CharSequence channel, int era, long length, List<Long> offsets, InputStream dataIS,
                            OutputStream os, boolean signed) throws IOException, ASAPException {
 
-        AssimilationPDU_Impl.sendPDU(peer, recipientPeer, format, channel, era, length, offsets, dataIS, os, signed);
+        AssimilationPDU_Impl.sendPDU(sender, recipient, format, channel, era, length, offsets, dataIS, os, signed);
     }
 
     @Override
-    public void assimilate(CharSequence peer, CharSequence recipientPeer, CharSequence format,
+    public void assimilate(CharSequence sender, CharSequence recipient, CharSequence format,
                            CharSequence channel, int era, List<Long> offsets, byte[] data,
                            OutputStream os, boolean signed) throws IOException, ASAPException {
 
         if(data == null || data.length == 0) throw new ASAPException("data must not be null");
         if(era < 0) throw new ASAPException("era must be a non-negative value: " + era);
 
-        this.assimilate(peer, recipientPeer, format, channel, era, data.length, offsets,
+        this.assimilate(sender, recipient, format, channel, era, data.length, offsets,
                 new ByteArrayInputStream(data), os, signed);
     }
 
     @Override
     public ASAP_PDU_1_0 readPDU(InputStream is) throws IOException, ASAPException {
         byte cmd = PDU_Impl.readByte(is);
+
+        // encrypted?
+        boolean encrypted = (cmd & ENCRYPTED_MASK) != 0;
+        // remove encrypted flag anyway
+        cmd = (byte)(cmd & CMD_MASK);
+
         int flagsInt = PDU_Impl.readByte(is);
 
         ASAP_PDU_1_0 pdu = null;

src/net/sharksystem/asap/protocol/ASAP_PDU_1_0.java

@@ -7,9 +7,14 @@ public interface ASAP_PDU_1_0 {
     byte getCommand();
 
     /**
-     * @return ID of sender of this message
+     * @return ID of sender of this message  - optional
      */
-    String getPeer();
+    String getSender();
+
+    /**
+     * @return ID of recipient of this message - optional
+     */
+    String getRecipient();
 
     /**
      * @return format A URI style is strongly recommended.
@@ -33,9 +38,14 @@ public interface ASAP_PDU_1_0 {
     int getEra();
 
     /**
-     * @return a flag that indicates whether the optional peer parameter was transmitted
+     * @return a flag that indicates whether the optional sender parameter was transmitted
+     */
+    boolean senderSet();
+
+    /**
+     * @return a flag that indicates whether the optional recipient parameter was transmitted
      */
-    boolean peerSet();
+    boolean recipientSet();
     /**
      * @return a flag that indicates whether the optional channel parameter was transmitted
      */

src/net/sharksystem/asap/protocol/AssimilationPDU_Impl.java

@@ -24,8 +24,8 @@ public AssimilationPDU_Impl(int flagsInt, InputStream is) throws IOException, AS
 
         evaluateFlags(flagsInt);
 
-        if(this.peerSet()) { this.readPeer(is); }
-        if(this.recipientPeerSet()) { this.readRecipientPeer(is); }
+        if(this.senderSet()) { this.readSender(is); }
+        if(this.recipientSet()) { this.readRecipientPeer(is); }
         this.readFormat(is);
         if(this.channelSet()) { this.readChannel(is); }
         if(this.eraSet()) { this.readEra(is); }
@@ -56,7 +56,7 @@ static void sendPDU(CharSequence peer, CharSequence recipientPeer, CharSequence
 
         // create parameter bytes
         int flags = 0;
-        flags = PDU_Impl.setFlag(peer, flags, PEER_BIT_POSITION);
+        flags = PDU_Impl.setFlag(peer, flags, SENDER_BIT_POSITION);
         flags = PDU_Impl.setFlag(recipientPeer, flags, RECIPIENT_PEER_BIT_POSITION);
         flags = PDU_Impl.setFlag(channel, flags, CHANNEL_BIT_POSITION);
         flags = PDU_Impl.setFlag(era, flags, ERA_BIT_POSITION);