zenon/ds-assignment-2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

commands "inbox" and "delete" handled

Browse Source
This commit is contained in:
Heri118 2021-01-05 13:43:34 +01:00
parent 8e35674b55
commit a9c8b45086
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dslab/client/IMessageClient.java
View File

@ -1,5 +1,8 @@
package dslab.client; package dslab.client;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
/** /**
* A Message Client application. * A Message Client application.
* *
@ -16,7 +19,7 @@ public interface IMessageClient extends Runnable {
/** /**
* Outputs the contents of the user's inbox on the shell. * Outputs the contents of the user's inbox on the shell.
*/ */
void inbox(); void inbox() throws BadPaddingException, IllegalBlockSizeException;
/** /**
* Deletes the mail with the given id. Prints 'ok' if the mail was deleted successfully, 'error {explanation}' * Deletes the mail with the given id. Prints 'ok' if the mail was deleted successfully, 'error {explanation}'
@ -24,7 +27,7 @@ public interface IMessageClient extends Runnable {
* *
* @param id the mail id * @param id the mail id
*/ */
void delete(String id); void delete(String id) throws BadPaddingException, IllegalBlockSizeException;
/** /**
* Verifies the signature of the message by calculating its hash value using the shared secret. Prints 'ok' if the * Verifies the signature of the message by calculating its hash value using the shared secret. Prints 'ok' if the

41
src/main/java/dslab/client/MessageClient.java
View File

@ -324,16 +324,51 @@ public class MessageClient implements IMessageClient, Runnable {
@Command @Command
@Override @Override
public void inbox() { public void inbox() throws BadPaddingException, IllegalBlockSizeException {
String message;
logger.info("Received 'inbox' command"); logger.info("Received 'inbox' command");
message = "list";
this.dmapOut.println(getAesCiphertext(message));
try {
String response = getAesPlaintext(this.dmapIn.readLine());
if (response.equals("ok DMAP2.0") || response.equals("ok DMAP")) {
this.dmapOut.println(getAesCiphertext(message));
response = getAesPlaintext(this.dmapIn.readLine());
}
String [] temp = response.split("\\s+");
String [] help = new String[temp.length / 3];
int count = 0;
for (int i = 0; i < help.length; i++) {
help[i] = temp[count];
count = count + 3;
}
String result = "";
for (int i = 0; i < help.length; i++) {
message = "show " + help[i];
this.dmapOut.println(getAesCiphertext(message));
result = getAesPlaintext(this.dmapIn.readLine() + "\n");
}
System.out.println("Your Mailbox: \n" + result);
} catch (IOException e) {
System.out.println("IO Exception " + e.getMessage());
}
} }
@Command @Command
@Override @Override
public void delete(String id) { public void delete(String id) throws BadPaddingException, IllegalBlockSizeException {
String message;
logger.info("Received 'delete' command for id " + id); logger.info("Received 'delete' command for id " + id);
message = "delete " + id;
this.dmapOut.println(getAesCiphertext(message));
try {
String result = "";
result = getAesPlaintext(dmapIn.readLine());
System.out.println(result);
} catch (IOException e) {
System.out.println("IO Exception " + e.getMessage());
}
} }
/** /**