lightcontainer/FileFrontEnd
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'dev' into jeremi

Browse Source 
# Conflicts:
#	app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveOkRule.java
#	app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java
#	app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java
#	app/src/main/java/lightcontainer/protocol/rules/writer/GetFileOkRule.java
#	app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileErrorRule.java
#	app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileOkRule.java
This commit is contained in:
Jérémi N ‘EndMove’ 2022-03-19 17:41:30 +01:00
commit 45f1bf20f7
Signed by: EndMove
GPG Key ID: 65C4A02E1F5371A4
56 changed files with 633 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/lightcontainer/App.java
View File

@ -3,6 +3,7 @@
*/
package lightcontainer;
import lightcontainer.domains.FFETimer;
import lightcontainer.domains.server.MulticastServerListener;
import lightcontainer.domains.server.UnicastServerListener;
import lightcontainer.interfaces.ProtocolRepository;
@ -17,6 +18,7 @@ import lightcontainer.storage.JsonAdapter;
import lightcontainer.storage.Repository;
import java.nio.file.Paths;
import java.util.Timer;
public class App {
@ -36,6 +38,11 @@ public class App {
FileFrontEnd ffe = new FileFrontEnd(clientRep, storeRep, protocolRep);
new UnicastServerListener(ffe, clientRep, protocolRep, repositoryStorage, repositoryStorage.getUnicastPort());
new MulticastServerListener(ffe, storeRep, protocolRep, repositoryStorage.getMulticastIp(), repositoryStorage.getMulticastPort(), repositoryStorage.getNetworkInterface());
// S'occupe de distribué les timeout pour les SBE plus connecté et donc de Timeout les clients
Timer ffeTimer = new Timer();
ffeTimer.schedule(new FFETimer(storeRep), 50000, 50000);
}
private static void initProtocols(Repository repositoryStorage, ProtocolRepository protocolRep) {
@ -87,9 +94,9 @@ public class App {
}
private static void setupVM() {
System.setProperty("javax.net.ssl.keyStore","../ffe.labo.swilabus.com.p12");
System.setProperty("javax.net.ssl.keyStorePassword","labo2022");
System.setProperty("https.protocols","TLSv1.3");
System.setProperty("javax.net.ssl.keyStore", "../ffe.labo.swilabus.com.p12");
System.setProperty("javax.net.ssl.keyStorePassword", "labo2022");
System.setProperty("https.protocols", "TLSv1.3");
}
}

34
app/src/main/java/lightcontainer/domains/FFETimer.java Normal file
View File

@ -0,0 +1,34 @@
package lightcontainer.domains;
import lightcontainer.interfaces.MulticastSPR;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.TimerTask;
/**
* Class s'occupant de gérer les timeout des différents SBE
*/
public class FFETimer extends TimerTask {
private final MulticastSPR processorRepository;
public FFETimer(MulticastSPR processorRepository) {
this.processorRepository = processorRepository;
}
@Override
public void run() {
System.out.println("Timer 1");
for (String domain : processorRepository.getDomains()) {
LocalDateTime lastAnnounce = processorRepository.getLastAnnounce(domain);
long secondBetween = Math.abs(ChronoUnit.SECONDS.between(lastAnnounce, LocalDateTime.now()));
System.out.println("Timer 2 : " + secondBetween);
if (secondBetween > 50) {
System.out.println("Timer 3");
processorRepository.closeStore(domain);
}
}
}
}

15
app/src/main/java/lightcontainer/domains/Task.java
View File

@ -10,13 +10,13 @@ import lightcontainer.protocol.ProtocolWriter;
public class Task {
// Variables
private TaskStatus status;
private ProtocolWriter.ProtocolResult command;
private final ProtocolWriter.ProtocolResult command;
/**
* Défini le context courrant dans laquelle la tâche opère
* Défini le context courant dans laquelle la tâche opère
*/
private Context context;
private final Context context;
public Task(Context context, TaskStatus status, ProtocolWriter.ProtocolResult command) {
this.context = context;
@ -26,26 +26,29 @@ public class Task {
/**
* Permet de créer une instance de la class {@link Task}
*
* @param context Context à utiliser pour cette tâche
* @param command Commande à exécuter
* @return L'instance de la tâche créée
*/
public static Task newInstance(Context context, ProtocolWriter.ProtocolResult command) {
Task task = new Task(context, TaskStatus.PENDING, command);
return task;
return new Task(context, TaskStatus.PENDING, command);
}
/**
* Permet de savoir si la réponse est destinée au client
*
* @param storeDomain Nom du store back end fournissant la réponse.
* @return TRUE si le client doit recevoir cette réponse.
*/
public boolean isResponseOfClient(String storeDomain) {
System.out.println(status + " - " + context.getDomain() + " | " + storeDomain);
return (status == TaskStatus.PROCESSING && context.getDomain().equals(storeDomain));
}
/**
* Permet de récupérer le login du client associé à la tâche
*
* @return Login du client
*/
public String getClient() {
@ -54,6 +57,7 @@ public class Task {
/**
* Permet de récupérer la commande à executer
*
* @return Commande à exécuter
*/
public ProtocolWriter.ProtocolResult getCommand() {
@ -62,6 +66,7 @@ public class Task {
/**
* Permet de définir le StorBackEnd à utiliser pour cette tâche
*
* @param storeDomain Le StorBackEnd à utiliser
*/
public void setDomain(String storeDomain) {

77
app/src/main/java/lightcontainer/domains/client/ClientHandler.java
View File

@ -1,6 +1,5 @@
package lightcontainer.domains.client;
import lightcontainer.domains.server.UnicastServerListener;
import lightcontainer.interfaces.ClientHandlerFFE;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.interfaces.UnicastCHR;
@ -10,36 +9,32 @@ import lightcontainer.protocol.rules.reader.SigninRule;
import lightcontainer.protocol.rules.reader.SignoutRule;
import lightcontainer.protocol.rules.reader.SignupRule;
import lightcontainer.protocol.rules.writer.SignErrorRule;
import lightcontainer.protocol.rules.writer.SignOkRule;
import javax.crypto.BadPaddingException;
import javax.net.ssl.SSLHandshakeException;
import java.io.*;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
/**
* ClientHandler
*
* <p>
* <!> UNICAST CLIENT <!>
* Class communicating with the client, and
* intercepting and sending files to the client.
*
* @version 1.1
* @since 1.0
*
* @see Runnable
* @see AutoCloseable
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @version 1.1
* @see Runnable
* @see AutoCloseable
* @since 1.0
*/
public class ClientHandler implements Runnable, AutoCloseable {
// Variables
private ClientHandlerFFE fileFrontEnd;
private final ClientHandlerFFE fileFrontEnd;
private final Socket client;
private ProtocolRepository protocolRep;
private Context context;
private final ProtocolRepository protocolRep;
private final Context context;
private boolean client_run;
private UnicastCHR repository;
private final UnicastCHR repository;
private BufferedReader reader;
@ -60,21 +55,20 @@ public class ClientHandler implements Runnable, AutoCloseable {
/**
* Initialise the Client's Reader and Writer.
*
* @since 1.0
*
* @see BufferedReader
* @see PrintWriter
* @see BufferedReader
* @see PrintWriter
* @since 1.0
*/
private void initClient() {
// Start the thread
try {
this.reader = new BufferedReader(new InputStreamReader(
this.client.getInputStream(),
StandardCharsets.UTF_8
this.client.getInputStream(),
StandardCharsets.UTF_8
));
this.writer = new PrintWriter(new OutputStreamWriter(
this.client.getOutputStream(),
StandardCharsets.UTF_8
this.client.getOutputStream(),
StandardCharsets.UTF_8
), true);
} catch (IOException e) {
e.printStackTrace();
@ -85,7 +79,7 @@ public class ClientHandler implements Runnable, AutoCloseable {
* Thread Function
* Start the dialogue with the client.
*
* @since 1.0
* @since 1.0
*/
@Override
public void run() {
@ -116,30 +110,33 @@ public class ClientHandler implements Runnable, AutoCloseable {
ProtocolWriter.ProtocolResult writerCommand = ruleResult.getResultCommand();
// TODO : Vérifier que le StorBackEnd demandé (Pas toujours demandé) est disponible
if (ruleResult.getReceiver() == ProtocolReader.ResultCmdReceiver.STOREBACKEND && !fileFrontEnd.canExecuteCommand(ruleResult.getRequestDomain())) {
System.out.println("[1] 1");
writer.print(ruleResult.onNotExecutable(context)); // Renvoie au client
writer.flush();
} else if (ruleResult.getReceiver() == ProtocolReader.ResultCmdReceiver.STOREBACKEND) {
System.out.println("[1] 2");
fileFrontEnd.newCommand(context, writerCommand); // Envoie dans la file de tâche FileFrontEnd en attente d'un traitement d'un StorBackEnd
// Attend la fin de la réalisation de la tâche
waitTaskResponse();
System.out.println("[1] 4");
if (response != null) {
System.out.println("[1] 5");
writer.write(response.getCommand()); // Renvoie au client
writer.flush();
response.write(this.client.getOutputStream()); // Ecrit au client si nécessaire
} else {
System.out.println("[1] 6");
writer.print(ruleResult.onNotExecutable(context)); // Renvoie au client
writer.flush();
}
} else {
System.out.println("[1] 3");
writer.print(writerCommand.getCommand()); // Renvoie au client
writer.flush();
}
} else {
System.out.println(4);
accessDenied();
}
} catch (IOException e) {
@ -153,11 +150,13 @@ public class ClientHandler implements Runnable, AutoCloseable {
this.writer.close();
this.client.close();
System.out.printf("[CLIENT] %s s'est déconnecté\n", context.getLogin());
} catch (IOException ignored) { }
} catch (IOException ignored) {
}
}
/**
* Permet de vérifier si le client possède l'accès demandé
*
* @param ruleResult La règle
* @return TRUE si le client possède l'accès demandé
*/
@ -175,7 +174,8 @@ public class ClientHandler implements Runnable, AutoCloseable {
try {
ruleResult.getClass().asSubclass(SigninRule.Result.class);
return true;
} catch (ClassCastException e2) { }
} catch (ClassCastException e2) {
}
}
return false;
@ -193,23 +193,25 @@ public class ClientHandler implements Runnable, AutoCloseable {
/**
* Vérifie s'il s'âgit d'une demande de déconnexion
*
* @param ruleResult
*/
private void checkSignout(ProtocolReader.ProtocolResult ruleResult) {
try {
ruleResult.getClass().asSubclass(SignoutRule.Result.class);
repository.disconnect(this);
} catch (ClassCastException e2) { }
} catch (ClassCastException e2) {
}
}
/**
* Vérifie s'il s'âgit d'une demande de déconnexion
* @param ruleResult
private void checkSignError(ProtocolWriter.ProtocolResult ruleResult) {
if (ruleResult.getCommand().startsWith(SignErrorRule.NAME)) {
System.out.println("Pas pu connecter");
repository.disconnect(this);
}
if (ruleResult.getCommand().startsWith(SignErrorRule.NAME)) {
System.out.println("Pas pu connecter");
repository.disconnect(this);
}
}
*/
@ -220,12 +222,15 @@ public class ClientHandler implements Runnable, AutoCloseable {
synchronized (this) {
try {
this.wait();
} catch (InterruptedException e) { e.printStackTrace(); }
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
/**
* Permet d'envoyer la réponse au client.
*
* @param response La réponse
*/
public void respond(ProtocolWriter.ProtocolResult response) {
@ -239,7 +244,7 @@ public class ClientHandler implements Runnable, AutoCloseable {
* AutoClosable Function
* Close the Client thread and resources.
*
* @since 1.0
* @since 1.0
*/
@Override
public void close() {

26
app/src/main/java/lightcontainer/domains/client/Context.java
View File

@ -107,7 +107,7 @@ public class Context {
}
/**
* Permet d'ajouter des données pour la requête courrante
* Permet d'ajouter des données pour la requête courante
*
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
@ -117,7 +117,7 @@ public class Context {
}
/**
* Permet d'ajouter des données pour la requête courrante
* Permet d'ajouter des données pour la requête courante
*
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
@ -127,7 +127,15 @@ public class Context {
}
/**
* Permet de récupérer des données pour la requête courrante
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
*/
public void putDataLong(String key, long value) {
requestBundle.putLong(key, value);
}
/**
* Permet de récupérer des données pour la requête courante
*
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé ou null
@ -137,7 +145,7 @@ public class Context {
}
/**
* Permet de récupérer des données pour la requête courrante
* Permet de récupérer des données pour la requête courante
*
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé
@ -146,6 +154,14 @@ public class Context {
return requestBundle.getInt(key);
}
/**
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé
*/
public long getDataLong(String key) {
return requestBundle.getLong(key);
}
/**
* Permet d'ajouter un fichier à l'utilisateur
*
@ -156,7 +172,7 @@ public class Context {
* @param domain Domain dans lequel est stocké le fichier
* @return TRUE si le fichier a pu être enregistré.
*/
public boolean addFile(String fileName, String fileNameSalt, int size, String iv, String domain) {
public boolean addFile(String fileName, String fileNameSalt, long size, String iv, String domain) {
return this.repository.addFileFor(new File(fileName, fileNameSalt, size, iv, Set.of(domain)), getLogin());
}

31
app/src/main/java/lightcontainer/domains/client/RequestBundle.java
View File

@ -5,13 +5,16 @@ import java.util.Map;
public class RequestBundle {
private Map<String, String> stringData = new HashMap<>();
private final Map<String, String> stringData = new HashMap<>();
private Map<String, Integer> intData = new HashMap<>();
private final Map<String, Integer> intData = new HashMap<>();
private final Map<String, Long> longData = new HashMap<>();
/**
* Permet d'ajouter des String
* @param key La clé permettant de retrouver la valeur
*
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
*/
public void putString(String key, String value) {
@ -20,7 +23,8 @@ public class RequestBundle {
/**
* Permet d'ajouter des int
* @param key La clé permettant de retrouver la valeur
*
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
*/
public void putInt(String key, int value) {
@ -29,6 +33,7 @@ public class RequestBundle {
/**
* Permet de récupérer des données string
*
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé ou null
*/
@ -38,10 +43,28 @@ public class RequestBundle {
/**
* Permet de récupérer des données int
*
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé
*/
public int getInt(String key) {
return intData.get(key);
}
/**
* @param key La clé permettant de retrouver la valeur
* @param value La valeur associée à la clé
*/
public void putLong(String key, long value) {
longData.put(key, value);
}
/**
*
* @param key La clé permettant de retrouver la valeur
* @return La valeur associée à la clé ou null
*/
public long getLong(String key) {
return longData.get(key);
}
}

59
app/src/main/java/lightcontainer/domains/client/StoreProcessor.java
View File

@ -10,21 +10,21 @@ import java.io.*;
import java.net.Socket;
import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* StoreProcessor
*
* <p>
* <!> MULTICAST CLIENT <!>
* Class communicating with the storebackend and
* processing the tasks in the FileFrontEnd
*
* @version 1.1
* @since 1.0
*
* @see Runnable
* @see AutoCloseable
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @version 1.1
* @see Runnable
* @see AutoCloseable
* @since 1.0
*/
public class StoreProcessor extends Thread implements AutoCloseable {
// Variables
@ -32,12 +32,14 @@ public class StoreProcessor extends Thread implements AutoCloseable {
private final Socket store;
private final String domain;
private boolean client_run;
private LocalDateTime lastAnnounce;
private BufferedReader reader;
private Context context;
private PrintWriter writer;
private ProtocolWriter.ProtocolResult protocolResult;
private ProtocolRepository protocolRep;
private final ProtocolRepository protocolRep;
// Constructor
public StoreProcessor(Socket socket, String domain, StoreProcessorFFE ffe, ProtocolRepository protocolRep) {
@ -81,9 +83,12 @@ public class StoreProcessor extends Thread implements AutoCloseable {
@Override
public void run() {
this.client_run = true;
while (this.client_run) {
try {
waitAction();
if (protocolResult == null) { // Si on n'a pas encore la commande à envoyer
waitAction();
}
System.out.println("[SBE] Envoie commande : " + protocolResult.getCommand());
// Request
@ -93,9 +98,8 @@ public class StoreProcessor extends Thread implements AutoCloseable {
try {
protocolResult.write(this.store.getOutputStream());
} catch (IOException writeException) { // Si SBE fermé
System.out.println("STOPPER");
// Envoie au client que la requête n'a pu être traitée
alertAvalaible(null);
alertAvailable(null);
break;
}
@ -105,19 +109,19 @@ public class StoreProcessor extends Thread implements AutoCloseable {
responseCommand += "\r\n";
ProtocolReader.ProtocolResult responseResult = protocolRep.executeReader(context, responseCommand);
if (responseResult != null) {
System.out.println("StoreBackEnd response to client: " + responseResult.getResultCommand());
System.out.println("StoreBackEnd (" + domain + ") response to client: " + responseResult.getResultCommand());
responseResult.read(
this.store.getInputStream()
);
alertAvalaible(responseResult.getResultCommand());
alertAvailable(responseResult.getResultCommand());
} else {
System.out.println("StoreBackEnd result: Commande null");
alertAvalaible(null);
alertAvailable(null);
}
} else {
System.out.println("StoreBackEnd: Commande null");
alertAvalaible(null);
alertAvailable(null);
}
} catch (IOException exception) {
@ -139,6 +143,7 @@ public class StoreProcessor extends Thread implements AutoCloseable {
/**
* Permet de demander au StoreBackEnd d'effectuer une commande
*
* @param protocolResult La commande à effectuer
*/
public void executeCommand(Context context, ProtocolWriter.ProtocolResult protocolResult) {
@ -152,7 +157,7 @@ public class StoreProcessor extends Thread implements AutoCloseable {
/**
* Permet de déclarer le StoreBackEnd disponible
*/
private void alertAvalaible(ProtocolWriter.ProtocolResult responseCommand) {
private void alertAvailable(ProtocolWriter.ProtocolResult responseCommand) {
synchronized (this) {
this.protocolResult = null;
if (responseCommand == null) {
@ -169,7 +174,9 @@ public class StoreProcessor extends Thread implements AutoCloseable {
synchronized (this) {
try {
this.wait();
} catch (InterruptedException e) { e.printStackTrace(); }
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
@ -183,6 +190,7 @@ public class StoreProcessor extends Thread implements AutoCloseable {
public void close() {
if (this.client_run) {
this.client_run = false;
System.out.println("[FERMETURE SBE] " + domain);
// TODO : Gérer déconnection (enlever du repo et prévenir client et FileFrontEnd)
}
}
@ -206,11 +214,26 @@ public class StoreProcessor extends Thread implements AutoCloseable {
return Objects.hash(domain);
}
public boolean canProcessTask(Task task) {
public boolean canProcessTask() {
return this.protocolResult == null; // Vérifier si tâche veut ce SBE
}
public String getDomain() {
return this.domain;
}
/**
* Permet de mettre à jours la dernière annonce de ce SBE au FFE
*/
public void setLastAnnounce(LocalDateTime lastAnnounce) {
this.lastAnnounce = lastAnnounce;
}
/**
* Permet de mettre à jours la dernière annonce de ce SBE au FFE
*/
public LocalDateTime getLastAnnounce() {
return lastAnnounce;
}
}

2
app/src/main/java/lightcontainer/domains/server/MulticastServerListener.java
View File

@ -94,6 +94,8 @@ public class MulticastServerListener implements Runnable {
// Add the store processor to its repository
this.repository.addStore(storeProcessor);
}
// Contient déjà le SBE donc maj de la dernière activité
this.repository.updateLastAnnounce(readerResult.getDomain());
} catch (IOException | ClassCastException exception) {
System.out.println("[ERREUR] Une SBE essaye de se connecter avec une mauvaise configuration : " + exception.getMessage());
}

2
app/src/main/java/lightcontainer/enumerations/TaskType.java
View File

@ -3,7 +3,7 @@ package lightcontainer.enumerations;
import lightcontainer.domains.Task;
/**
* enumeration to define the type of a {@link Task}.
* enumeration to define the type of {@link Task}.
*/
public enum TaskType {
SEND,

1
app/src/main/java/lightcontainer/interfaces/ClientHandlerFFE.java
View File

@ -13,6 +13,7 @@ public interface ClientHandlerFFE {
/**
* Demande le traitement d'une commande
*
* @param context Context de la requête
* @param command Commande à traiter
*/

27
app/src/main/java/lightcontainer/interfaces/MulticastSPR.java
View File

@ -5,23 +5,28 @@ import lightcontainer.domains.client.StoreProcessor;
import lightcontainer.domains.server.MulticastServerListener;
import lightcontainer.repository.StoreProcessorRepository;
import java.time.LocalDateTime;
import java.util.Collection;
/**
* A communication interface between a {@link StoreProcessor} and the {@link StoreProcessorRepository}.
*/
public interface MulticastSPR {
/**
* Setter, allow to define the ServerListener of a repository.
*
* @param server ServerListener to set as default.
*/
void setServerListener(MulticastServerListener server);
/**
* Add a StorePorcessor.
*
* @param store Store processor to add.
*/
boolean addStore(StoreProcessor store);
String findDomain(Task task);
String findDomain();
void assignTask(String stor, Task task);
@ -36,7 +41,27 @@ public interface MulticastSPR {
/**
* Permet de déconnecter un SBE
*
* @param domain Le domaine du SBE à déconnecter
*/
void closeStore(String domain);
/**
* Permet de mettre à jours la dernière annonce de ce SBE au FFE
* @param domain Le domain s'annoncant
*/
void updateLastAnnounce(String domain);
/**
* Permet de récupérer les noms des domaines connectés au FFE
* @return Les noms des domaines connectés au FFE
*/
Collection<String> getDomains();
/**
* Permet de récupérer la dernière annonce d'un SBE
* @return La dernière annonce d'un SBE
*/
LocalDateTime getLastAnnounce(String domain);
}

2
app/src/main/java/lightcontainer/interfaces/ProtocolRepository.java
View File

@ -8,7 +8,7 @@ public interface ProtocolRepository {
<T extends ProtocolReader.ProtocolResult> T executeReader(Context context, String data);
<T extends ProtocolWriter.ProtocolResult> T executeWriter(Context context, String cmdName, String... data);
<T extends ProtocolWriter.ProtocolResult> T executeWriter(Context context, String cmdName, String... data);
void addReader(ProtocolReader reader);

6
app/src/main/java/lightcontainer/interfaces/StoreProcessorFFE.java
View File

@ -10,13 +10,15 @@ import lightcontainer.repository.FileFrontEnd;
public interface StoreProcessorFFE {
/**
* Allows a {@link StoreProcessor} to notify the FFE that it's available.
* @param store The store processor that is now available.
* @param responseCommand
*
* @param store The store processor that is now available.
* @param response
*/
void onStoreAvailable(StoreProcessor store, ProtocolWriter.ProtocolResult response);
/**
* Permet de déconnecter un SBE
*
* @param domain Le domaine du SBE à déconnecter
*/
void onStoreDisconnect(String domain);

3
app/src/main/java/lightcontainer/interfaces/UnicastCHR.java
View File

@ -12,18 +12,21 @@ import lightcontainer.repository.ClientHandlerRepository;
public interface UnicastCHR {
/**
* Setter, allow to define the ServerListener of a repository.
*
* @param server ServerListener to set as default.
*/
void setServerListener(UnicastServerListener server);
/**
* Add a ClientHandler.
*
* @param client Client Handler to add.
*/
void addClient(ClientHandler client);
/**
* Permet de demander la déconnection d'un client
*
* @param client Le client à déconnecter
*/
void disconnect(ClientHandler client);

3
app/src/main/java/lightcontainer/protocol/ProtocolReader.java
View File

@ -95,7 +95,8 @@ public abstract class ProtocolReader {
*
* @param reader Buffer rempli du fichier
*/
public void read(InputStream reader) { }
public void read(InputStream reader) {
}
/**
* Permet de récupérer le context courant

9
app/src/main/java/lightcontainer/protocol/ProtocolWriter.java
View File

@ -23,6 +23,7 @@ public abstract class ProtocolWriter {
/**
* Permet de récupérer le nom de la commande.
*
* @return Nom de la commande.
*/
public final String getCmdName() {
@ -50,12 +51,15 @@ public abstract class ProtocolWriter {
/**
* Permet d'écrire un fichier sur le réseau. Cad envoyer le contenu d'un fichier sur le réseau.
* Redéfinissez cette méthode pour l'utiliser.
*
* @param writer Buffer à remplir qui sera envoyer via le réseau
*/
public void write(OutputStream writer) throws IOException {}
public void write(OutputStream writer) throws IOException {
}
/**
* Accesseur au contexte courant sur lequel opère la commande
*
* @return Context
*/
public Context getContext() {
@ -66,6 +70,7 @@ public abstract class ProtocolWriter {
/**
* Permet de contruire une commande selon une règle établie.
*
* @param data Les données à ajouter dans la commande; L'ordre défini leur position dans la commande
* @return La commande construites
*/
@ -74,7 +79,7 @@ public abstract class ProtocolWriter {
StringBuilder builder = new StringBuilder(this.cmdName);
for (String param : data)
builder.append(" " + param);
builder.append(" ").append(param);
String command = builder + "\r\n";
Matcher ruleMatcher = this.rulePattern.matcher(command); // Vérifie que tout match (cf. Matcher). Si match alors on retourne la commande build, sinon on retourne NULL

14
app/src/main/java/lightcontainer/protocol/StandardizedDefinitions.java
View File

@ -5,10 +5,10 @@ public class StandardizedDefinitions {
//Parties de regex non-utilisées en dehors de cette classe.
private final static String DIGIT = "[\\x30-\\x39]";
private final static String VISIBLECHAR = "[\\x20-\\xFF]";
private final static String PASSCHAR = "[\\x20-\\xFF]";
private final static String PASSCHAR = "[\\x22-\\xFF]";
private final static String BINARY = "[\\x00-\\xFF]";
private final static String LETTER = "[\\x41-\\x5A\\x61-\\x7A]";
private final static String DIGIT_LETTER = DIGIT + "|" + LETTER;
private final static String DIGIT_LETTER = "[\\x30-\\x39\\x41-\\x5A\\x61-\\x7A]";
private final static String PORT = "(6553[\\x30-\\x35])|(655[\\x30-\\x32][\\x30-\\x39])|(65[\\x30-\\x34][\\x30-\\x32]{2})|(6[\\x30-\\x34][\\x30-\\x39]{3})|([\\x31-\\x35][\\x30-\\x39]{4})|([\\x30-\\x35]{0,5})|([\\x30-\\x39]{1,4})";
private final static String SIZE = DIGIT + "{1,10}";
private final static String LINE = "\\x0D\\x0A";
@ -18,7 +18,7 @@ public class StandardizedDefinitions {
private final static String DOMAIN = "[a-z-A-Z0-9\\.]{5,20}";
private final static String HASH_FILENAME = DIGIT_LETTER + "{50,200}";
private final static String HASH_FILECONTENT = DIGIT_LETTER + "{50,200}";
private final static String FILE_INFO = HASH_FILENAME + BL + SIZE + BL + HASH_FILECONTENT;
private final static String FILE_INFO = "(" + HASH_FILENAME + ")" + BL + "(" + SIZE + ")" + BL + "(" + HASH_FILECONTENT + ")";
private final static String LOGIN = DIGIT_LETTER + "{5,20}";
//Regex à utiliser dans les différents protocoles.
@ -29,11 +29,11 @@ public class StandardizedDefinitions {
public final static String FFE_SENDFILE = "^SENDFILE" + BL + FILE_INFO + LINE + "$";
public final static String SBE_SEND_RESULT_OK = "^SEND_OK" + LINE + "$";
public final static String SBE_SEND_RESULT_ERROR = "^SEND_ERROR" + LINE + "$";
public final static String FFE_ERASE_FILE = "^ERASEFILE" + BL + HASH_FILENAME + LINE + "$";
public final static String FFE_ERASE_FILE = "^ERASEFILE" + BL + "(" + HASH_FILENAME + ")" + LINE + "$";
public final static String SBE_ERASE_RESULT_OK = "^ERASE_OK" + LINE + "$";
public final static String SBE_ERASE_RESULT_ERROR = "^ERASE_ERROR" + LINE + "$";
public final static String FFE_RETRIEVE_FILE = "^RETRIEVEFILE" + BL + HASH_FILENAME + LINE + "$";
public final static String SBE_RETRIEVE_RESULT_OK = "^RETRIEVE_OK" + BL + "(" + FILE_INFO + ")" + LINE + "$";
public final static String FFE_RETRIEVE_FILE = "^RETRIEVEFILE" + BL + "(" + HASH_FILENAME + ")" + LINE + "$";
public final static String SBE_RETRIEVE_RESULT_OK = "^RETRIEVE_OK" + BL + FILE_INFO + LINE + "$";
public final static String SBE_RETRIEVE_RESULT_ERROR = "^RETRIEVE_ERROR" + LINE + "$";
//Client demande à FFE une tâche. FFE répond à client.
@ -42,7 +42,7 @@ public class StandardizedDefinitions {
public final static String FFE_SIGN_OK = "^SIGN_OK" + LINE + "$";
public final static String FFE_SIGN_ERROR = "^SIGN_ERROR" + LINE + "$";
public final static String CLIENT_FILE_LIST = "^FILELIST" + LINE + "$";
public final static String FFE_FILE_LIST_RESULT = "^FILES" + "((" + PASSCHAR + "{1,20})!(" + DIGIT + "{1,10})){0,50}" + LINE + "$";
public final static String FFE_FILE_LIST_RESULT = "^FILES" + "( (" + PASSCHAR + "{1,20})!(" + DIGIT + "{1,10})){0,50}" + LINE + "$";
public final static String CLIENT_SAVE_FILE = "^SAVEFILE" + BL + "(" + FILENAME + ")" + BL + "(" + SIZE + ")" + LINE + "$";
public final static String FFE_SAVE_FILE_OK = "^SAVEFILE_OK" + LINE + "$";
public final static String FFE_SAVE_FILE_ERROR = "^SAVEFILE_ERROR" + LINE + "$";

6
app/src/main/java/lightcontainer/protocol/rules/reader/EraseErrorRule.java
View File

@ -5,9 +5,11 @@ import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.rules.writer.RemoveFileErrorRule;
public class EraseErrorRule extends ProtocolReader {
import static lightcontainer.protocol.StandardizedDefinitions.SBE_ERASE_RESULT_ERROR;
private static final String PATTERN = "^ERASE_ERROR\r\n$";
public class EraseErrorRule extends ProtocolReader {
//"^ERASE_ERROR\r\n$"
private static final String PATTERN = SBE_ERASE_RESULT_ERROR;
private static final String NAME = "ERASE_ERROR";

4
app/src/main/java/lightcontainer/protocol/rules/reader/EraseOkRule.java
View File

@ -5,9 +5,11 @@ import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.rules.writer.RemoveFileOkRule;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_ERASE_RESULT_OK;
public class EraseOkRule extends ProtocolReader {
private static final String PATTERN = "^ERASE_OK\r\n$";
private static final String PATTERN = SBE_ERASE_RESULT_OK;
private static final String NAME = "ERASE_OK";

6
app/src/main/java/lightcontainer/protocol/rules/reader/FilelistRule.java
View File

@ -7,16 +7,18 @@ import lightcontainer.protocol.rules.writer.FilesRule;
import java.util.List;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_FILE_LIST;
/**
* Règle permettant de récupérer la liste des fichiers d'un utilisateur
*/
public class FilelistRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^FILELIST\r\n$";
private static final String PATTERN = CLIENT_FILE_LIST;
private static final String NAME = "FILELIST";
private ProtocolRepository protocolRep;
private final ProtocolRepository protocolRep;
// Constructor
public FilelistRule(ProtocolRepository protocolRep) {

12
app/src/main/java/lightcontainer/protocol/rules/reader/GetFileRule.java
View File

@ -4,15 +4,17 @@ import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.rules.writer.GetFileErrorRule;
import lightcontainer.protocol.rules.writer.RemoveFileErrorRule;
import lightcontainer.protocol.rules.writer.RetrieveFileRule;
import lightcontainer.storage.ReadOnlyFile;
import java.util.Iterator;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_GET_FILE;
public class GetFileRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^GETFILE ([^ !]{1,20})\r\n$";
//"^GETFILE ([^ !]{1,20})\r\n$"
private static final String PATTERN = CLIENT_GET_FILE;
private static final String NAME = "GETFILE";
// -- arguments
private static final int FILE_NAME = 0; // Index file name.
@ -59,7 +61,7 @@ public class GetFileRule extends ProtocolReader {
// Save into bundle
context.putDataString("fileName", file.getName());
context.putDataInt("fileSize", file.getSize());
context.putDataLong("fileSize", file.getSize());
context.putDataString("fileIV", file.getIv());
// Create cmd for storebacked
@ -80,9 +82,11 @@ public class GetFileRule extends ProtocolReader {
return result;
}
/** TMP
/**
* TMP
* TODO : But futur est de pouvoir en avoir plusieurs (sbe)
* Cette méthode permet de choisir le domaine voulu.
*
* @param storageIterator Les domaines
* @return Le domain choisi
*/

8
app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java
View File

@ -3,14 +3,16 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.protocol.ProtocolReader;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_HELLO;
/**
* Règle permettant d'être alerter de l'annoncement d'un SBE
*/
public class HelloRule extends ProtocolReader {
//"^HELLO ([A-Za-z0-9.]{5,20}) ([\\d]{0,5})\r\n$"
private static final String PATTERN = SBE_HELLO;
private static final String PATTERN = "^HELLO ([A-Za-z0-9]{5,20}) ([0-9]{1,5})\r\n$";
private static final String NAME = "HELLO";
private static final String NAME = "HELLO";
// Index du domain dans le tableau de donnée
private static final int DOMAIN = 0;

8
app/src/main/java/lightcontainer/protocol/rules/reader/RemoveFileRule.java
View File

@ -3,15 +3,18 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.protocol.rules.writer.EraseFileRule;
import lightcontainer.protocol.rules.writer.RemoveFileErrorRule;
import lightcontainer.storage.ReadOnlyFile;
import java.util.Iterator;
public class RemoveFileRule extends ProtocolReader {
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_REMOVE_FILE;
private static final String PATTERN = "^REMOVEFILE ([^ !]{1,20})\r\n$";
public class RemoveFileRule extends ProtocolReader {
//"^REMOVEFILE ([^ !]{1,20})\r\n$"
private static final String PATTERN = CLIENT_REMOVE_FILE;
private static final String NAME = "REMOVEFILE";
@ -68,6 +71,7 @@ public class RemoveFileRule extends ProtocolReader {
/**
* TODO : But futur est de pouvoir en avoir plusieurs
* Cette méthode permet de choisir le domaine voulu.
*
* @param storageIterator Les domaines
* @return Le domain choisi
*/

6
app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveErrorRule.java
View File

@ -3,11 +3,15 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.protocol.rules.writer.GetFileErrorRule;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_RETRIEVE_RESULT_ERROR;
public class RetrieveErrorRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^RETRIEVE_ERROR\r\n$";
//"^RETRIEVE_ERROR\r\n$"
private static final String PATTERN = SBE_RETRIEVE_RESULT_ERROR;
private static final String NAME = "RETRIEVE_ERROR";
// Variables

22
app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveOkRule.java
View File

@ -10,9 +10,12 @@ import lightcontainer.utils.SHA;
import java.io.InputStream;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_RETRIEVE_RESULT_OK;
public class RetrieveOkRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^RETRIEVE_OK ([A-Za-z0-9.]{50,200}) ([0-9]{1,10}) ([A-Za-z0-9.]{50,200})\r\n$";
//"^RETRIEVE_OK ([A-Za-z0-9.]{50,200}) ([0-9]{1,10}) ([A-Za-z0-9.]{50,200})\r\n$"
private static final String PATTERN = SBE_RETRIEVE_RESULT_OK;
private static final String NAME = "RETRIEVE_OK";
// -- arguments
private static final int HASHED_FILE_NAME = 0; // Index hashed filename
@ -20,8 +23,8 @@ public class RetrieveOkRule extends ProtocolReader {
private static final int HASHED_FILE_CONTENT = 2; // Index hashed file content
// Variables
private ProtocolRepository protocolRep;
private String storagePath;
private final ProtocolRepository protocolRep;
private final String storagePath;
// Variables
public RetrieveOkRule(ProtocolRepository protocolRep, String storagePath) {
@ -32,11 +35,11 @@ public class RetrieveOkRule extends ProtocolReader {
public class Result extends ProtocolResult {
// Variables
private String filename;
private int filesize;
private final String filename;
private final long filesize;
private String hashedFileContent;
public Result(Context context, String filename, int filesize, String hashedFileContent) {
public Result(Context context, String filename, long filesize, String hashedFileContent) {
super(context);
this.filename = filename;
this.filesize = filesize;
@ -47,12 +50,11 @@ public class RetrieveOkRule extends ProtocolReader {
return filename;
}
public int getFilesize() {
public long getFilesize() {
return filesize;
}
/**
* Bitch has bettern than my money
* @param reader Buffer rempli du fichier
*/
@Override
@ -84,11 +86,11 @@ public class RetrieveOkRule extends ProtocolReader {
RetrieveOkRule.Result result = new RetrieveOkRule.Result(context, data[HASHED_FILE_NAME], Integer.parseInt(data[FILE_SIZE]), data[HASHED_FILE_CONTENT]);
// save encrypted file size into bundle
context.putDataInt("encryptedFileSize", result.getFilesize()); // TODO to long ?!
context.putDataLong("encryptedFileSize", result.getFilesize()); // TODO to long ?!
context.putDataString("hashedFileName", result.getFilename());
// Set result command
result.setResultCommand(protocolRep.executeWriter(context, GetFileOkRule.NAME, context.getDataString("fileName"), String.valueOf(context.getDataInt("fileSize"))), ResultCmdReceiver.CLIENT);
result.setResultCommand(protocolRep.executeWriter(context, GetFileOkRule.NAME, context.getDataString("fileName"), String.valueOf(context.getDataLong("fileSize"))), ResultCmdReceiver.CLIENT);
return result;
}

24
app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java
View File

@ -3,15 +3,15 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.protocol.rules.writer.SaveFileErrorRule;
import lightcontainer.protocol.rules.writer.SaveFileOkRule;
import lightcontainer.protocol.rules.writer.SendfileRule;
import lightcontainer.utils.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.NoSuchAlgorithmException;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_SAVE_FILE;
/**
* Règle permettant de sauvegarder un fichier sur le SBE.
@ -19,15 +19,16 @@ import java.security.NoSuchAlgorithmException;
*/
public class SavefileRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^SAVEFILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$";
//"^SAVEFILE ([^ !]{1,20}) ([0-9]{1,10})\r\n$"
private static final String PATTERN = CLIENT_SAVE_FILE;
private static final String NAME = "SAVEFILE";
private static final int FILE_NAME = 0; // Index file name.
private static final int FILE_SIZE = 1; // Index file size.
private ProtocolRepository protocolRep;
private String storagePath;
private final ProtocolRepository protocolRep;
private final String storagePath;
// Constructor
public SavefileRule(ProtocolRepository protocolRep, String storagePath) {
@ -39,13 +40,14 @@ public class SavefileRule extends ProtocolReader {
public class Result extends ProtocolResult {
// Variables
private String filename;
private int size;
private final long size;
// Construct
public Result(Context context, String filename, int size) {
public Result(Context context, String filename, long size) {
super(context);
this.filename = filename;
this.size = size;
System.out.println(size);
}
@Override
@ -70,13 +72,15 @@ public class SavefileRule extends ProtocolReader {
String iv = AES_GCM.generateIV();
// retrieve file and new size
int encryptedFileSize = fileReceiver.receiveFile(reader, this.filename, this.size, key, iv);
long encryptedFileSize = fileReceiver.receiveFile(reader, this.filename, this.size, key, iv);
if (encryptedFileSize < 0) throw new IOException();
System.out.println(encryptedFileSize);
String fileHash = SHA.hashFile(storagePath, this.filename);
// On met les données de la requête actuelle
getContext().putDataInt("size", size);
getContext().putDataLong("size", size);
getContext().putDataString("iv", iv);
getContext().putDataString("fileNameSalt", fileNameSalt);

13
app/src/main/java/lightcontainer/protocol/rules/reader/SendErrorRule.java
View File

@ -3,23 +3,22 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.protocol.rules.writer.SaveFileErrorRule;
import lightcontainer.utils.ShaHasher;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_SEND_RESULT_ERROR;
/**
* Règle permettant de de confirmer la sauvegrade d'un fichier.
*/
public class SendErrorRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^SEND_ERROR\r\n$";
//"^SEND_ERROR\r\n$"
private static final String PATTERN = SBE_SEND_RESULT_ERROR;
private static final String NAME = "SEND_ERROR";
private static final String NAME = "SENDERROR";
private ProtocolRepository protocolRep;
private final ProtocolRepository protocolRep;
// Constructor
public SendErrorRule(ProtocolRepository protocolRep) {

5
app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java
View File

@ -5,13 +5,16 @@ import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.rules.writer.SaveFileOkRule;
import static lightcontainer.protocol.StandardizedDefinitions.SBE_SEND_RESULT_OK;
/**
* Règle permettant de de confirmer la sauvegrade d'un fichier.
*/
public class SendOkRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^SEND_OK\r\n$";
//"^SEND_OK\r\n$"
private static final String PATTERN = SBE_SEND_RESULT_OK;
private static final String NAME = "SEND_OK";

8
app/src/main/java/lightcontainer/protocol/rules/reader/SigninRule.java
View File

@ -3,22 +3,26 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.interfaces.ProtocolRepository;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.protocol.rules.writer.SignErrorRule;
import lightcontainer.protocol.rules.writer.SignOkRule;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_SIGN_IN;
/**
* Règle permettant de gérer la connection d'un utilisateur
*/
public class SigninRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^SIGNIN ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$";
//"^SIGNIN ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$"
private static final String PATTERN = CLIENT_SIGN_IN;
private static final String NAME = "SIGNIN";
private static final int LOGIN = 0; // Index du domain dans le tableau de données
private static final int PASSWORD = 1; // Index du port dans le tableau de données
private ProtocolRepository protocolRep;
private final ProtocolRepository protocolRep;
// Constructor
public SigninRule(ProtocolRepository protocolRep) {

7
app/src/main/java/lightcontainer/protocol/rules/reader/SignoutRule.java
View File

@ -2,13 +2,16 @@ package lightcontainer.protocol.rules.reader;
import lightcontainer.domains.client.Context;
import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.StandardizedDefinitions;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_SIGN_OUT;
/**
* Règle demandant la déconnexion du client
*/
public class SignoutRule extends ProtocolReader {
private static final String PATTERN = "^SIGNOUT\r\n$";
//"^SIGNOUT\r\n$"
private static final String PATTERN = CLIENT_SIGN_OUT;
public static final String NAME = "SIGNOUT";

7
app/src/main/java/lightcontainer/protocol/rules/reader/SignupRule.java
View File

@ -6,17 +6,20 @@ import lightcontainer.protocol.ProtocolReader;
import lightcontainer.protocol.rules.writer.SignErrorRule;
import lightcontainer.protocol.rules.writer.SignOkRule;
import static lightcontainer.protocol.StandardizedDefinitions.CLIENT_SIGN_UP;
/**
* Règle permettant de gérer la création d'un utilisateur
*/
public class SignupRule extends ProtocolReader {
// Constants
private static final String PATTERN = "^SIGNUP ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$";
//"^SIGNUP ([A-Za-z0-9]{5,20}) ([^ !]{5,50})\r\n$"
private static final String PATTERN = CLIENT_SIGN_UP;
private static final String NAME = "SIGNUP";
private static final int LOGIN = 0;
private static final int PASSWORD = 1;
private ProtocolRepository protocolRep;
private final ProtocolRepository protocolRep;
public SignupRule(ProtocolRepository protocolRep) {
super(NAME, PATTERN);

7
app/src/main/java/lightcontainer/protocol/rules/writer/EraseFileRule.java
View File

@ -1,15 +1,20 @@
package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.protocol.StandardizedDefinitions;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_ERASE_FILE;
public class EraseFileRule extends ProtocolWriter {
private static final String PATTERN = "^ERASEFILE ([A-Za-z0-9.]{50,200})\r\n$";
//"^ERASEFILE ([A-Za-z0-9.]{50,200})\r\n$"
private static final String PATTERN = FFE_ERASE_FILE;
public static String NAME = "ERASEFILE";
public EraseFileRule() {
super(NAME, PATTERN);
System.out.println(PATTERN);
}
}

7
app/src/main/java/lightcontainer/protocol/rules/writer/FilesRule.java
View File

@ -1,13 +1,16 @@
package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.protocol.StandardizedDefinitions;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_FILE_LIST_RESULT;
/**
* Règle permettant de construire une commande contenant la liste des fichiers d'un utilisateur
*/
public class FilesRule extends ProtocolWriter {
private static final String PATTERN = "^FILES( ([^ !]{1,20})!([0-9]{1,10})){0,50}\r\n$";
//"^FILES( ([^ !]{1,20})!([0-9]{1,10})){0,50}\r\n$"
private static final String PATTERN = FFE_FILE_LIST_RESULT;
public static final String NAME = "FILES";

3
app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java
View File

@ -10,7 +10,8 @@ import lightcontainer.utils.DeepFileEraser;
*/
public class GetFileErrorRule extends ProtocolWriter {
// Constants
private static final String PATTERN = "^GETFILE_ERROR\r\n$";
//"^GETFILE_ERROR\r\n$"
private static final String PATTERN = FFE_GET_FILE_RESULT_ERROR;
public static final String NAME = "GETFILE_ERROR";
// Variables

17
app/src/main/java/lightcontainer/protocol/rules/writer/GetFileOkRule.java
View File

@ -8,16 +8,19 @@ import lightcontainer.utils.FileSender;
import java.io.IOException;
import java.io.OutputStream;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_GET_FILE_RESULT_OK;
public class GetFileOkRule extends ProtocolWriter {
// Constants
private static final String PATTERN = "^GETFILE_OK ([^ !]{1,20}) ([0-9]{1,10})\r\n$";
//"^GETFILE_OK ([^ !]{1,20}) ([0-9]{1,10})\r\n$"
private static final String PATTERN = FFE_GET_FILE_RESULT_OK;
public static final String NAME = "GETFILE_OK";
// -- params
private static final int FILE_NAME = 0; // Index file name hashed
private static final int FILE_SIZE = 1; // Index file size
// Variables
private String storagePath;
private final String storagePath;
// Constructors
public GetFileOkRule(String storagePath) {
@ -27,11 +30,11 @@ public class GetFileOkRule extends ProtocolWriter {
public class Result extends ProtocolWriter.ProtocolResult {
// Variables
private String filename;
private int filesize;
private final String filename;
private final long filesize;
// Constructors
public Result(Context context, String filename, int filesize) {
public Result(Context context, String filename, long filesize) {
super(context);
this.filename = filename;
this.filesize = filesize;
@ -39,17 +42,19 @@ public class GetFileOkRule extends ProtocolWriter {
/**
* Oh yeahh baby by tonton EndMove ;-)
*
* @param writer Buffer à remplir qui sera envoyer via le réseau
*/
@Override
public void write(OutputStream writer) throws IOException {
System.out.printf("Sauvegarde du fichier : %s %d\n", this.filename, this.filesize);
System.out.println("Encrypted size for parsing: " + getContext().getDataLong("encryptedFileSize") + " normal: " + getContext().getDataLong("fileSize"));
FileSender fileSender = new FileSender(storagePath);
fileSender.sendFile(
getContext().getDataString("hashedFileName"),
writer,
getContext().getDataInt("encryptedFileSize"), // Encrypted file size (because data is parsing into AES system)
getContext().getDataLong("encryptedFileSize"), // Encrypted file size (because data is parsing into AES system)
getContext().getAesKey(),
getContext().getDataString("fileIV")
);

5
app/src/main/java/lightcontainer/protocol/rules/writer/RemoveFileErrorRule.java
View File

@ -2,9 +2,12 @@ package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_REMOVE_ERROR;
public class RemoveFileErrorRule extends ProtocolWriter {
private static final String PATTERN = "^REMOVEFILE_ERROR\r\n$";
//"^REMOVEFILE_ERROR\r\n$"
private static final String PATTERN = FFE_REMOVE_ERROR;
public static String NAME = "REMOVEFILE_ERROR";

6
app/src/main/java/lightcontainer/protocol/rules/writer/RemoveFileOkRule.java
View File

@ -2,9 +2,11 @@ package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
public class RemoveFileOkRule extends ProtocolWriter {
import static lightcontainer.protocol.StandardizedDefinitions.FFE_REMOVE_OK;
private static final String PATTERN = "^REMOVEFILE_OK\r\n$";
public class RemoveFileOkRule extends ProtocolWriter {
//"^REMOVEFILE_OK\r\n$"
private static final String PATTERN = FFE_REMOVE_OK;
public static String NAME = "REMOVEFILE_OK";
public RemoveFileOkRule() {

5
app/src/main/java/lightcontainer/protocol/rules/writer/RetrieveFileRule.java
View File

@ -2,9 +2,12 @@ package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_RETRIEVE_FILE;
public class RetrieveFileRule extends ProtocolWriter {
// Constants
private static final String PATTERN = "^RETRIEVEFILE ([A-Za-z0-9.]{50,200})\r\n$";
//"^RETRIEVEFILE ([A-Za-z0-9]{50,200})\r\n$"
private static final String PATTERN = FFE_RETRIEVE_FILE;
public static final String NAME = "RETRIEVEFILE";
// Constructor

23
app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileErrorRule.java
View File

@ -5,12 +5,14 @@ import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.utils.DeepFileEraser;
import lightcontainer.utils.ShaHasher;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_SAVE_FILE_ERROR;
/**
* Règle signifiant que la sauvegarde d'un fichier a échoué
*/
public class SaveFileErrorRule extends ProtocolWriter {
private static final String PATTERN = "^SAVEFILE_ERROR\r\n$";
//"^SAVEFILE_ERROR\r\n$"
private static final String PATTERN = FFE_SAVE_FILE_ERROR;
public static final String NAME = "SAVEFILE_ERROR";
@ -25,13 +27,18 @@ public class SaveFileErrorRule extends ProtocolWriter {
@Override
protected ProtocolResult onExecuted(Context context, String... data) {
ProtocolResult result = new ProtocolResult(context);
String fileName = context.getDataString("fileName");
String fileNameSalt = context.getDataString("fileNameSalt");
// Suppression du fichier temporaire dans le stockage du FFE
ShaHasher hasher = new ShaHasher(context.getLogin() + "_" + context.getDataString("fileName"));
try {
DeepFileEraser.eraseFile(String.format("%s/%s", this.storagePath,
hasher.fromSalt(hasher.saltToByte(context.getDataString("fileNameSalt")))));
} catch (DeepFileEraser.DeepFileEraserException ignore) { }
if (fileName != null && fileNameSalt != null) {
// Suppression du fichier temporaire dans le stockage du FFE
ShaHasher hasher = new ShaHasher(context.getLogin() + "_" + context.getDataString("fileName"));
try {
DeepFileEraser.eraseFile(String.format("%s/%s", this.storagePath,
hasher.fromSalt(hasher.saltToByte(context.getDataString("fileNameSalt")))));
} catch (DeepFileEraser.DeepFileEraserException ignore) {
}
}
return result;
}
}

9
app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileOkRule.java
View File

@ -4,12 +4,14 @@ import lightcontainer.domains.client.Context;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.utils.DeepFileEraser;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_SAVE_FILE_OK;
/**
* Règle signifiant que la sauvegarde d'un fichier fût un succès
*/
public class SaveFileOkRule extends ProtocolWriter {
private static final String PATTERN = "^SAVEFILE_OK\r\n$";
//"^SAVEFILE_OK\r\n$"
private static final String PATTERN = FFE_SAVE_FILE_OK;
public static final String NAME = "SAVEFILE_OK";
@ -24,8 +26,9 @@ public class SaveFileOkRule extends ProtocolWriter {
protected ProtocolWriter.ProtocolResult onExecuted(Context context, String... data) {
ProtocolWriter.ProtocolResult result = new ProtocolWriter.ProtocolResult(context);
System.out.println("===> Save en json " + context.getDomain() + " - " + context.getLogin());
// Sauvegarder dans JSON
context.addFile(context.getDataString("fileName"), context.getDataString("fileNameSalt"), context.getDataInt("size"), context.getDataString("iv"), context.getDomain());
context.addFile(context.getDataString("fileName"), context.getDataString("fileNameSalt"), context.getDataLong("size"), context.getDataString("iv"), context.getDomain());
// Suppression du fichier temporaire dans le stockage du FFE
String hashedFileName = context.getHashedFileName(context.getDataString("fileName"));

13
app/src/main/java/lightcontainer/protocol/rules/writer/SendfileRule.java
View File

@ -2,17 +2,20 @@ package lightcontainer.protocol.rules.writer;
import lightcontainer.domains.client.Context;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.protocol.StandardizedDefinitions;
import lightcontainer.utils.FileSender;
import java.io.IOException;
import java.io.OutputStream;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_SENDFILE;
/**
* Règle envoyée au SBE, demandant la sauvegarde d'un fichier.
*/
public class SendfileRule extends ProtocolWriter {
private static final String PATTERN = "^SENDFILE [A-Za-z0-9.]{50,200} [0-9]{1,10} [A-Za-z0-9.]{50,200}\r\n$";
//"^SENDFILE [A-Za-z0-9]{50,200} [0-9]{1,10} [A-Za-z0-9]{50,200}\r\n$"
private static final String PATTERN = FFE_SENDFILE;
public static final String NAME = "SENDFILE";
@ -20,7 +23,7 @@ public class SendfileRule extends ProtocolWriter {
private static final int FILE_SIZE = 1; // Index file size.
private static final int HASHED_FILE_CONTENT = 2; // Index file content hashed.
private String storagePath;
private final String storagePath;
public SendfileRule(String storagePath) {
super(NAME, PATTERN);
@ -30,10 +33,10 @@ public class SendfileRule extends ProtocolWriter {
public class Result extends ProtocolWriter.ProtocolResult {
private final String hashedFileName;
private final int fileSize;
private final long fileSize;
private final String hashedFileContent;
public Result(Context context, String hashedFileName, int fileSize, String hashedFileContent) {
public Result(Context context, String hashedFileName, long fileSize, String hashedFileContent) {
super(context);
this.hashedFileName = hashedFileName;
this.fileSize = fileSize;

7
app/src/main/java/lightcontainer/protocol/rules/writer/SignErrorRule.java
View File

@ -1,13 +1,16 @@
package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.protocol.StandardizedDefinitions;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_SIGN_ERROR;
/**
* Règle renvoyée au client lorsque l'authentification a échoué.
*/
public class SignErrorRule extends ProtocolWriter {
private static final String PATTERN = "^SIGN_ERROR\r\n$";
//"^SIGN_ERROR\r\n$"
private static final String PATTERN = FFE_SIGN_ERROR;
public static final String NAME = "SIGN_ERROR";

7
app/src/main/java/lightcontainer/protocol/rules/writer/SignOkRule.java
View File

@ -1,13 +1,16 @@
package lightcontainer.protocol.rules.writer;
import lightcontainer.protocol.ProtocolWriter;
import lightcontainer.protocol.StandardizedDefinitions;
import static lightcontainer.protocol.StandardizedDefinitions.FFE_SIGN_OK;
/**
* Règle renvoyée au client lorsque l'authentification a réusie.
*/
public class SignOkRule extends ProtocolWriter {
private static final String PATTERN = "^SIGN_OK\r\n$";
//"^SIGN_OK\r\n$"
private static final String PATTERN = FFE_SIGN_OK;
public static final String NAME = "SIGN_OK";

24
app/src/main/java/lightcontainer/repository/ClientHandlerRepository.java
View File

@ -8,18 +8,18 @@ import lightcontainer.protocol.ProtocolWriter;
import java.util.ArrayList;
import java.util.List;
// TODO : C'est genre un ClientHandlerManager quoi hein, normal qu'il fasse blinder de chose ;)
/**
* ClientHandlerRepository
*
* <p>
* Repository storing ClientHandler class.
* Contains some utility functions.
*
* @version 1.0
* @since 1.0
*
* @see ClientHandler
* @see AutoCloseable
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @version 1.0
* @see ClientHandler
* @see AutoCloseable
* @since 1.0
*/
public class ClientHandlerRepository implements AutoCloseable, UnicastCHR {
// Variable
@ -34,9 +34,9 @@ public class ClientHandlerRepository implements AutoCloseable, UnicastCHR {
/**
* Setter, allow to define the ServerListener of a repository.
* & Start the server.
* @param server ServerListener to set as default.
*
* @since 1.0
* @param server ServerListener to set as default.
* @since 1.0
*/
@Override
public void setServerListener(UnicastServerListener server) {
@ -46,9 +46,9 @@ public class ClientHandlerRepository implements AutoCloseable, UnicastCHR {
/**
* Add a ClientHandler.
* @param client Client Handler to add.
*
* @since 1.0
* @param client Client Handler to add.
* @since 1.0
*/
@Override
public void addClient(ClientHandler client) {
@ -75,7 +75,7 @@ public class ClientHandlerRepository implements AutoCloseable, UnicastCHR {
* AutoClosable Function
* Closes all ClientHandlers stored in this repository and deallocates all resources.
*
* @since 1.0
* @since 1.0
*/
@Override
public void close() {

14
app/src/main/java/lightcontainer/repository/FileFrontEnd.java
View File

@ -16,8 +16,8 @@ import java.util.concurrent.ConcurrentLinkedDeque;
public class FileFrontEnd implements ClientHandlerFFE, StoreProcessorFFE {
// Variables
private Deque<Task> tasks = new ConcurrentLinkedDeque<>();
private ClientHandlerRepository clientRepository; // TODO -> pourquoi pas une interface ? end
private StoreProcessorRepository storeRepository; // TODO -> pourquoi pas une interface ? end
private final ClientHandlerRepository clientRepository; // TODO -> pourquoi pas une interface ? end
private final StoreProcessorRepository storeRepository; // TODO -> pourquoi pas une interface ? end
private ProtocolRepository protocolRepository;
// Constructor
@ -32,7 +32,7 @@ public class FileFrontEnd implements ClientHandlerFFE, StoreProcessorFFE {
*/
public void alertStoreProcessors(Task task) {
// On avertit les stor processors d'une nouvelle tâche
String stor = storeRepository.findDomain(task);
String stor = storeRepository.findDomain();
if (stor != null) {
storeRepository.assignTask(stor, task);
task.setDomain(stor);
@ -47,13 +47,10 @@ public class FileFrontEnd implements ClientHandlerFFE, StoreProcessorFFE {
*/
@Override
public void onStoreAvailable(StoreProcessor store, ProtocolWriter.ProtocolResult response) {
// TODO : Chercher une tâche appropriée
Iterator<Task> it = tasks.iterator();
while (it.hasNext()) {
Task task = it.next();
System.out.println("Cherche");
if (task.isResponseOfClient(store.getDomain())) {
System.out.println("Task trouvée");
clientRepository.respondToClient(task.getClient(), response);
it.remove(); // Suppression de la tâche
break;
@ -70,12 +67,11 @@ public class FileFrontEnd implements ClientHandlerFFE, StoreProcessorFFE {
private void assignOtherTask(StoreProcessor store) {
Iterator<Task> it = tasks.iterator();
while (it.hasNext()) {
Task task = it.next();
if (store.canProcessTask(task)) {
storeRepository.assignTask(store.getDomain(), task);
if (task.getDomain() == null && store.canProcessTask()) {
task.setDomain(store.getDomain());
store.executeCommand(task.getContext(), task.getCommand());
return;
}
}

1
app/src/main/java/lightcontainer/repository/ProtocolRepositoryImpl.java
View File

@ -31,7 +31,6 @@ public class ProtocolRepositoryImpl implements ProtocolRepository {
return command;
}
}
System.out.println("COMMANDE NULL");
return null;
}

107
app/src/main/java/lightcontainer/repository/StoreProcessorRepository.java
View File

@ -5,21 +5,23 @@ import lightcontainer.domains.client.StoreProcessor;
import lightcontainer.domains.server.MulticastServerListener;
import lightcontainer.interfaces.MulticastSPR;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
// TODO : C'est genre un ClientHandlerManager quoi hein, normal qu'il fasse blinder de chose ;)
/**
* StoreProcessorRepository
*
* <p>
* Repository storing StorePorcessor class.
* Contains some utility functions.
*
* @version 1.0
* @since 1.0
*
* @see StoreProcessor
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @author Jérémi NIHART <j.nihart@student.helmo.be>
* @version 1.0
* @see StoreProcessor
* @since 1.0
*/
public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
// Variables
@ -34,9 +36,9 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
/**
* Setter, allow to define the ServerListener of a repository.
* & start the server.
* @param server ServerListener to set as default.
*
* @since 1.0
* @param server ServerListener to set as default.
* @since 1.0
*/
@Override
public void setServerListener(MulticastServerListener server) {
@ -46,9 +48,9 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
/**
* Add a StorePorcessor.
* @param store Store processor to add.
*
* @since 1.0
* @param store Store processor to add.
* @since 1.0
*/
@Override
public boolean addStore(StoreProcessor store) {
@ -60,14 +62,24 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
}
@Override
public String findDomain(Task task) {
StoreProcessor handler = findSBE(task);
public String findDomain() {
StoreProcessor handler = findSBE();
return handler == null ? null : handler.getDomain();
}
private StoreProcessor findSBE(Task task) {
private StoreProcessor findSBE() {
for (StoreProcessor handler : handlers) {
if (handler.canProcessTask(task)) {
if (handler.canProcessTask()) {
return handler;
}
}
return null;
}
private StoreProcessor getSBE(String stor) {
for (StoreProcessor handler : handlers) {
if (handler.getDomain().equals(stor)) {
return handler;
}
}
@ -77,9 +89,10 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
@Override
public void assignTask(String stor, Task task) {
StoreProcessor handler = findSBE(task);
System.out.println("Find stor : " + handler);
handler.executeCommand(task.getContext(), task.getCommand());
StoreProcessor handler = getSBE(stor);
if (handler != null) {
handler.executeCommand(task.getContext(), task.getCommand());
}
}
@Override
@ -112,24 +125,59 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
*/
@Override
public void closeStore(String domain) {
Iterator<StoreProcessor> it = this.handlers.iterator();
System.out.println("1 Nombre de SBE : " + handlers.size());
while (it.hasNext()) {
StoreProcessor storeProcessor = it.next();
if (storeProcessor.getDomain().equals(domain)) {
storeProcessor.close();
it.remove();
return;
}
StoreProcessor storeProcessor = getSBE(domain);
if (storeProcessor != null) {
storeProcessor.close();
handlers.remove(storeProcessor);
}
}
/**
* Permet de mettre à jours la dernière annonce de ce SBE au FFE
*
* @param domain Le domain s'annoncant
*/
@Override
public void updateLastAnnounce(String domain) {
StoreProcessor storeProcessor = getSBE(domain);
if (storeProcessor != null) {
storeProcessor.setLastAnnounce(LocalDateTime.now());
}
}
/**
* Permet de récupérer les noms des domaines connectés au FFE
*
* @return Les noms des domaines connectés au FFE
*/
@Override
public Collection<String> getDomains() {
Set<String> domains = new HashSet<>();
for (StoreProcessor domain : handlers) {
domains.add(domain.getDomain());
}
return domains;
}
/**
* Permet de récupérer la dernière annonce d'un SBE
*
* @param domain
* @return La dernière annonce d'un SBE
*/
@Override
public LocalDateTime getLastAnnounce(String domain) {
StoreProcessor storeProcessor = getSBE(domain);
return storeProcessor == null ? null : storeProcessor.getLastAnnounce();
}
/**
* AutoClosable Function
* Closes all StoreProcessor stored in this repository and deallocates all resources.
*
* @since 1.0
* @since 1.0
*/
@Override
public void close() {
@ -138,4 +186,7 @@ public class StoreProcessorRepository implements AutoCloseable, MulticastSPR {
// Close each client.
this.handlers.forEach(StoreProcessor::close);
}
}

1
app/src/main/java/lightcontainer/storage/AppConfig.java
View File

@ -90,6 +90,7 @@ public class AppConfig {
/**
* Méthode permettant de récupérer le chemin de sauvegarde des fichiers
*
* @return Chemin de sauvegarde
*/
public String getStoragePath() {

6
app/src/main/java/lightcontainer/storage/File.java
View File

@ -10,12 +10,12 @@ public class File implements ReadOnlyFile {
// Variables
private final String name;
private final String fileNameSalt;
private final int size;
private final long size;
private final String iv;
private final Set<String> storage;
// Constructor
public File(String name, String fileNameSalt, int size, String iv, Set<String> storage) {
public File(String name, String fileNameSalt, long size, String iv, Set<String> storage) {
this.name = name;
this.fileNameSalt = fileNameSalt;
this.size = size;
@ -34,7 +34,7 @@ public class File implements ReadOnlyFile {
}
@Override
public int getSize() {
public long getSize() {
return size;
}

2
app/src/main/java/lightcontainer/storage/ReadOnlyFile.java
View File

@ -8,7 +8,7 @@ public interface ReadOnlyFile {
String getFileNameSalt();
int getSize();
long getSize();
String getIv();

129
app/src/main/java/lightcontainer/utils/AES_GCM.java
View File

@ -11,10 +11,9 @@ import java.util.Base64;
/**
* AES GCM 256 Encryption Class [DO NOT EDIT]
*
* @since 1.0
* @version 1.0
*
* @author Jérémi Nihart <contact@endmove.eu>
* @version 1.0
* @since 1.0
*/
public class AES_GCM {
// Constants
@ -23,8 +22,7 @@ public class AES_GCM {
public static final int GCM_TAG_LENGTH = 16;
// Main method for testing
public static void main(String[] args) throws Exception
{
public static void main(String[] args) throws Exception {
/*
* FILE ENCRYPTION DEMO
*/
@ -38,20 +36,20 @@ public class AES_GCM {
String IVFile = generateIV();
String keyFile = generateSecretKey();
// Show options
System.out.println("IV : "+IVFile);
System.out.println("Key : "+keyFile);
System.out.println("IV : " + IVFile);
System.out.println("Key : " + keyFile);
// Encrypt
encryptStream(
new FileInputStream(inFile),
new FileOutputStream(outFile),
new FileInputStream(inFile),
new FileOutputStream(outFile),
inFile.length(),
IVFile,
keyFile
);
// Decrypt
decryptStream(
new FileInputStream(outFile),
new FileOutputStream(clearFile),
new FileInputStream(outFile),
new FileOutputStream(clearFile),
outFile.length(),
IVFile,
keyFile
@ -65,8 +63,8 @@ public class AES_GCM {
String IV = generateIV();
String key = generateSecretKey();
// Show options
System.out.println("IV : "+IV);
System.out.println("Key : "+key);
System.out.println("IV : " + IV);
System.out.println("Key : " + key);
System.out.println("Original text : " + plainText);
// Crypt
String cryptText = encrypt(plainText, key, IV);
@ -79,8 +77,8 @@ public class AES_GCM {
/**
* Decoder to decode base64 vector to byte vector.
*
* @param base64Vector A base64 encoded vector.
* @return Byte vector.
* @param base64Vector A base64 encoded vector.
* @return Byte vector.
*/
private static byte[] decodeBase64Vector(String base64Vector) {
Base64.Decoder b64Decoder = Base64.getDecoder();
@ -90,10 +88,9 @@ public class AES_GCM {
/**
* Decoder to decode base64 string to plain string.
*
* @param base64String A base64 encoded string.
* @return Plain string.
*
* @see AES_GCM#decodeBase64Vector(String)
* @param base64String A base64 encoded string.
* @return Plain string.
* @see AES_GCM#decodeBase64Vector(String)
*/
private static String decodeBase64String(String base64String) {
return new String(decodeBase64Vector(base64String));
@ -101,8 +98,9 @@ public class AES_GCM {
/**
* Encoder to encode vector to base64 string.
* @param rawVector A raw vector.
* @return A base64 encoded vector.
*
* @param rawVector A raw vector.
* @return A base64 encoded vector.
*/
private static String encodeBase64(byte[] rawVector) {
Base64.Encoder b64Encoder = Base64.getEncoder();
@ -111,10 +109,10 @@ public class AES_GCM {
/**
* Encoder to encode string to base64 string.
* @param rawString A raw string.
* @return A base64 encoded string.
*
* @see AES_GCM#encodeBase64(byte[]))
* @param rawString A raw string.
* @return A base64 encoded string.
* @see AES_GCM#encodeBase64(byte[]))
*/
private static String encodeBase64(String rawString) {
return encodeBase64(rawString.getBytes(StandardCharsets.UTF_8));
@ -123,14 +121,12 @@ public class AES_GCM {
/**
* FACTORY, to setting up a Java cryptographic cypher.
*
* @param op_mode the operation mode of this cipher (this is one of the
* following: ENCRYPT_MODE, DECRYPT_MODE, WRAP_MODE or UNWRAP_MODE)
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
*
* @return A Cryptography cypher.
*
* @throws AesGcmException Throw an exception in case of an error occur while setting up the the cypher.
* @param op_mode the operation mode of this cipher (this is one of the
* following: ENCRYPT_MODE, DECRYPT_MODE, WRAP_MODE or UNWRAP_MODE)
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
* @return A Cryptography cypher.
* @throws AesGcmException Throw an exception in case of an error occur while setting up the the cypher.
*/
private static Cipher createCipher(int op_mode, String key, String IV) throws AesGcmException {
try {
@ -151,9 +147,8 @@ public class AES_GCM {
/**
* Generate a secret key base64 encoded.
*
* @return New Secret key b64 encoded.
*
* @throws AesGcmException Exception if an error occur.
* @return New Secret key b64 encoded.
* @throws AesGcmException Exception if an error occur.
*/
public static String generateSecretKey() throws AesGcmException {
try {
@ -169,7 +164,7 @@ public class AES_GCM {
/**
* Generate an IV (initialisation vector) base64 encoded.
*
* @return New generated IV b64 encoded.
* @return New generated IV b64 encoded.
*/
public static String generateIV() {
byte[] IV = new byte[GCM_IV_LENGTH];
@ -181,13 +176,11 @@ public class AES_GCM {
/**
* Encrypt text, with AES GCM.
*
* @param plainText Plain text to encrypt.
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
*
* @return The encrypted plain text Base64 encoded.
*
* @throws AesGcmException Exception if an error occur.
* @param plainText Plain text to encrypt.
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
* @return The encrypted plain text Base64 encoded.
* @throws AesGcmException Exception if an error occur.
*/
public static String encrypt(String plainText, String key, String IV) throws AesGcmException {
try {
@ -204,13 +197,12 @@ public class AES_GCM {
* Encrypt stream, with AES GCM.
* The output stream is automatically closed after processing.
*
* @param in InputStream to the input, flux to encrypt.
* @param out OutputStream to the output, encrypted flux.
* @param fileSize Stream/file size (! unencrypted size !).
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
*
* @throws AesGcmException Exception if an error occur.
* @param in InputStream to the input, flux to encrypt.
* @param out OutputStream to the output, encrypted flux.
* @param fileSize Stream/file size (! unencrypted size !).
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
* @throws AesGcmException Exception if an error occur.
*/
public static void encryptStream(InputStream in, OutputStream out, long fileSize, String key, String IV) throws AesGcmException {
byte[] buffer = new byte[1024];
@ -222,7 +214,7 @@ public class AES_GCM {
// Initialize a CipherOutputStream
CipherOutputStream cipherOut = new CipherOutputStream(out, cipher);
// Encryption Process
while((currentSize < fileSize) && (bytes = in.read(buffer)) > 0) {
while ((currentSize < fileSize) && (bytes = in.read(buffer)) > 0) {
cipherOut.write(buffer, 0, bytes);
cipherOut.flush();
currentSize += bytes;
@ -237,13 +229,11 @@ public class AES_GCM {
/**
* Decrypt, with AES GCM.
*
* @param cryptText The encrypted text.
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
*
* @return The decrypted plain text.
*
* @throws AesGcmException Exception if an error occur.
* @param cryptText The encrypted text.
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
* @return The decrypted plain text.
* @throws AesGcmException Exception if an error occur.
*/
public static String decrypt(String cryptText, String key, String IV) throws AesGcmException {
try {
@ -260,13 +250,12 @@ public class AES_GCM {
* Decrypt stream, with AES GCM.
* The input stream is automatically closed after processing.
*
* @param in InputStream to the input, flux to decrypt.
* @param out OutputStream to the output, decrypted flux.
* @param fileSize Stream/file size (! encrypted size !).
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
*
* @throws AesGcmException Exception if an error occur.
* @param in InputStream to the input, flux to decrypt.
* @param out OutputStream to the output, decrypted flux.
* @param fileSize Stream/file size (! encrypted size !).
* @param key Base64 encoded secret key.
* @param IV Base64 encoded vector.
* @throws AesGcmException Exception if an error occur.
*/
public static void decryptStream(InputStream in, OutputStream out, long fileSize, String key, String IV) throws AesGcmException {
byte[] buffer = new byte[1024];
@ -278,7 +267,7 @@ public class AES_GCM {
// Initialize a CipherOutputStream
CipherInputStream cipherIn = new CipherInputStream(in, cipher);
// Encryption Process
while((currentSize < fileSize) && (bytes = cipherIn.read(buffer)) > 0) {
while ((currentSize < fileSize) && (bytes = cipherIn.read(buffer)) > 0) {
out.write(buffer, 0, bytes);
out.flush();
currentSize += bytes;
@ -301,7 +290,7 @@ public class AES_GCM {
* Constructor of AesGcmException,
* which define it's own detail message.
*
* @param msg The detail message.
* @param msg The detail message.
*/
public AesGcmException(String msg) {
super(msg);
@ -312,7 +301,7 @@ public class AES_GCM {
* which propagates the error triggering
* a crash of the encryption system.
*
* @param e Previous exception throwable.
* @param e Previous exception throwable.
*/
public AesGcmException(Throwable e) {
super(e);
@ -324,8 +313,8 @@ public class AES_GCM {
* a crash of the encryption system with
* a chosen detail message.
*
* @param e Previous exception throwable.
* @param msg The detail message.
* @param e Previous exception throwable.
* @param msg The detail message.
*/
public AesGcmException(GeneralSecurityException e, String msg) {
super(msg, e);

23
app/src/main/java/lightcontainer/utils/FileReceiver.java
View File

@ -3,11 +3,13 @@ package lightcontainer.utils;
import java.io.*;
public class FileReceiver {
private String path;
private final String path;
public FileReceiver(String path) { this.path = path; }
public FileReceiver(String path) {
this.path = path;
}
public int receiveFile(InputStream input, String fileName, int fileSize, String key, String iv) {
public int receiveFile(InputStream input, String fileName, long fileSize, String key, String iv) {
try {
File file = new File(String.format("%s/%s", path, fileName));
if (file.createNewFile()) {
@ -16,8 +18,8 @@ public class FileReceiver {
AES_GCM.encryptStream(input, bufferedStream, fileSize, key, iv);
}
}
return (int)file.length(); // TODO change the size to LONG
} catch(IOException | AES_GCM.AesGcmException ex) {
return (int) file.length(); // TODO change the size to LONG
} catch (IOException | AES_GCM.AesGcmException ex) {
ex.printStackTrace();
return -1;
}
@ -32,7 +34,7 @@ public class FileReceiver {
bosFile = new BufferedOutputStream(new FileOutputStream(String.format("%s/%s", path, fileName)));
long currentOffset = 0;
while((currentOffset < fileSize) && ((bytesReceived = input.read(buffer)) > 0)) {
while ((currentOffset < fileSize) && ((bytesReceived = input.read(buffer)) > 0)) {
bosFile.write(buffer, 0, bytesReceived);
currentOffset += bytesReceived;
}
@ -40,9 +42,14 @@ public class FileReceiver {
bosFile.close();
return true;
} catch(Exception ex) {
} catch (Exception ex) {
ex.printStackTrace();
if(bosFile != null) { try { bosFile.close(); } catch(Exception e) {} }
if (bosFile != null) {
try {
bosFile.close();
} catch (Exception e) {
}
}
return false;
}
}

25
app/src/main/java/lightcontainer/utils/FileSender.java
View File

@ -3,46 +3,49 @@ package lightcontainer.utils;
import java.io.*;
public class FileSender {
private static final int DEFAULT_BUFFER=8000;
private static final int DEFAULT_BUFFER = 8000;
private final String path;
public FileSender(String path) { this.path = path; }
public FileSender(String path) {
this.path = path;
}
public boolean sendFile(String filename, OutputStream out, int fileSize, String aesKey, String iv) throws IOException {
public boolean sendFile(String filename, OutputStream out, long fileSize, String aesKey, String iv) throws IOException {
BufferedInputStream bisFile;
System.out.printf("Envoie fichier : %s - %s - %s \n", filename, aesKey, iv);
try {
File f = new File(String.format("%s/%s", path, filename));
if(f.exists()) {
if (f.exists()) {
bisFile = new BufferedInputStream(new FileInputStream(f));
AES_GCM.decryptStream(bisFile, out, fileSize, aesKey, iv);
return true;
} else
return false;
} catch(IOException | AES_GCM.AesGcmException ex) {
} catch (IOException | AES_GCM.AesGcmException ex) {
throw new IOException();
}
}
public boolean sendFile(String filename, OutputStream out) throws IOException {
BufferedInputStream bisFile;
int bytesReaded = 0;
int bytesRead = 0;
try {
File file = new File(String.format("%s/%s", path, filename));
long fileSize = file.length();
if(file.exists()) {
if (file.exists()) {
byte[] buffer = new byte[DEFAULT_BUFFER];
bisFile = new BufferedInputStream(new FileInputStream(file));
long currentOffset = 0;
while((currentOffset < fileSize) && (bytesReaded = bisFile.read(buffer)) > 0) {
out.write(buffer, 0, bytesReaded); out.flush();
currentOffset+= bytesReaded;
while ((currentOffset < fileSize) && (bytesRead = bisFile.read(buffer)) > 0) {
out.write(buffer, 0, bytesRead);
out.flush();
currentOffset += bytesRead;
}
bisFile.close();
return true;
} else
return false;
} catch(IOException ex) {// todo change
} catch (IOException ex) {// todo change
throw ex;
}
}

12
app/src/main/java/lightcontainer/utils/NetChooser.java
View File

@ -18,7 +18,7 @@ public class NetChooser {
public NetworkInterface requestInterface() {
Scanner console = new Scanner(System.in);
String[] allInterfaceNames = getInterfaces();
for(int index=0; index < allInterfaceNames.length; ++index) {
for (int index = 0; index < allInterfaceNames.length; ++index) {
System.out.printf("%d. %s\n", index, allInterfaceNames[index]);
}
System.out.printf("Select your interface :");
@ -35,28 +35,28 @@ public class NetChooser {
NetworkInterface currentInterface = discoveredInterfaces.nextElement();
Enumeration<InetAddress> inetAddresses = currentInterface.getInetAddresses();
int ipCount = 0;
while(inetAddresses.hasMoreElements()) {
while (inetAddresses.hasMoreElements()) {
InetAddress currentAddress = inetAddresses.nextElement();
ipCount++;
}
if(ipCount > 0)
if (ipCount > 0)
interfaces.add(currentInterface);
}
} catch(SocketException ex) {
} catch (SocketException ex) {
ex.printStackTrace();
}
}
public NetworkInterface getInterfacesByIndex(int i) {
if(i >= 0)
if (i >= 0)
return interfaces.get(i);
else
return null;
}
public String[] getInterfaces() {
if(interfaces.size() > 0) {
if (interfaces.size() > 0) {
String[] result = new String[interfaces.size()];
for (int i = 0; i < interfaces.size(); ++i) {
result[i] = interfaces.get(i).getDisplayName() + " --> " + interfaces.get(i).getName();

29
app/src/main/java/lightcontainer/utils/SHA.java
View File

@ -13,10 +13,9 @@ import java.util.Base64;
/**
* SHA 256 Hashing and borrowing Class [DO NOT EDIT]
*
* @since 1.0
* @version 1.0
*
* @author Jérémi Nihart <contact@endmove.eu>
* @version 1.0
* @since 1.0
*/
public class SHA {
// Constants
@ -42,12 +41,10 @@ public class SHA {
/**
* Make a borrowing of the stream.
*
* @param in InputStream to the input, flux to hash.
* @param fileSize Stream/file size.
*
* @return Borrowing of the full current flux.
*
* @throws ShaException if an error occur.
* @param in InputStream to the input, flux to hash.
* @param fileSize Stream/file size.
* @return Borrowing of the full current flux.
* @throws ShaException if an error occur.
*/
public static String hashStream(InputStream in, long fileSize) throws ShaException {
StringBuilder sb = new StringBuilder();
@ -58,7 +55,7 @@ public class SHA {
// Init Digest algo
MessageDigest digest = MessageDigest.getInstance(SHA_VERSION);
// Process flux
while ((currentSize < fileSize) && (bytes=in.read(buffer)) > 0) {
while ((currentSize < fileSize) && (bytes = in.read(buffer)) > 0) {
digest.update(buffer, 0, bytes);
currentSize += bytes;
}
@ -77,12 +74,10 @@ public class SHA {
/**
* Make a borrowing of the file.
*
* @param rootPath Root path of the file.
* @param fileName File Name.
*
* @return Borrowing of the file.
*
* @throws ShaException if an error occur.
* @param rootPath Root path of the file.
* @param fileName File Name.
* @return Borrowing of the file.
* @throws ShaException if an error occur.
*/
public static String hashFile(String rootPath, String fileName) throws ShaException {
try {
@ -109,7 +104,7 @@ public class SHA {
* which propagates the error triggering
* a crash of the hash system.
*
* @param e Previous exception throwable.
* @param e Previous exception throwable.
*/
public ShaException(Throwable e) {
super(e);

25
app/src/main/resources/appdata.json
View File

@ -1 +1,24 @@
{"unicast_port":8000,"multicast_ip":"224.66.66.1","multicast_port":15502,"network_interface":"lo","tls":true,"storagePath":"D:\\ffe","users":[{"name":"aaaaa","password":"$2a$10$HAupXer5aVEDgIAtFQchyOSB.SyCq7irV7EZNcMTE3R9k.1UJGOLu","aes_key":"FvsflaQGR+OoV11chJTCxd24owRPvyz1T42JXIU9fwE=","files":[{"name":"map_91.dat","fileNameSalt":"vtUOlQQ6Vt4bbpNexyBvog==","size":693,"iv":"ylk0R79Fq2/eDccVi8GTfA==","storage":["orglightcont01"]},{"name":"OutPutStream.mp3","fileNameSalt":"3qw+LauZUc13xh6fwnMHnQ==","size":53037,"iv":"40sIX0VtASM9man5XkM64Q==","storage":["orglightcont01"]},{"name":"wait.mp4","fileNameSalt":"1wnuehjUPI895TgCy2e/EQ==","size":1210962,"iv":"fCM6WG1PxOu9ieEjPuQiFg==","storage":["orglightcont01"]},{"name":"loader.gif","fileNameSalt":"05nNafgD/SNPg+y/MzI2DA==","size":89594,"iv":"GLoY4/PybIz72Sbz9jFgRQ==","storage":["orglightcont01"]},{"name":"extensions.mp4","fileNameSalt":"BYam5baM4WUPdaQZDu2eyw==","size":1501471,"iv":"ugCXHr7yVsY8rnB1znEfew==","storage":["orglightcont01"]},{"name":"007.mp4","fileNameSalt":"12jEfd3/dT9akqzdWn1vsg==","size":1742707,"iv":"CyKf2OHPABn//ez5L2o3Jg==","storage":["orglightcont01"]}]}]}
{
"unicast_port": 8000,
"multicast_ip": "224.66.66.1",
"multicast_port": 15502,
"network_interface": "wlp1s0",
"tls": true,
"storagePath": "/home/benjamin/ffe",
"users": [
{
"name": "benjamin",
"password": "$2a$10$I4vHt83CTYuQCP7xvZ04Ne7Vb0cswBiVZhV0n23k9FCxoH0ny9fZG",
"aes_key": "mAP6izUBUhBxIkakH2yB/TplhRz1OQV5Fp6HQmhywns=",
"files": [
]
},
{
"name": "aaaaa",
"password": "$2a$10$nDCEDVwbNO/YDQ4qdRcxfuES4.aboluLzWouXXsk6vDoaWocv516W",
"aes_key": "kYtwHy9qJBg30WS6axWTFGVE0Ge5kpYiJJlC+COIEI4=",
"files": [
]
}
]
}