#include "Error.h"
#include "URL.h"
#include "Mac.h"
+#include "Table.h"
+#include "Slot.h"
+#include "Crypto.h"
+#include "ByteBuffer.h"
+#include "aes.h"
+#include <sys/socket.h>
+#include <unistd.h>
/**
* Empty Constructor needed for child class.
listeningPort(-1),
localServerThread(NULL),
doEnd(false),
- timer(TimingSingleton_getInstance())
+ timer(TimingSingleton_getInstance()),
+ getslot(new Array<char>("getslot", 7)),
+ putslot(new Array<char>("putslot", 7))
{
}
+void *threadWrapper(void *cloud) {
+ CloudComm *c = (CloudComm *) cloud;
+ c->localServerWorkerFunction();
+ return NULL;
+}
+
/**
* Constructor for actual use. Takes in the url and password.
*/
doEnd(false),
timer(TimingSingleton_getInstance()) {
if (listeningPort > 0) {
- localServerThread = new Thread(new Runnable() {
- void run() {
- localServerWorkerFunction();
- }
- });
- localServerThread->start();
+ pthread_create(&localServerThread, NULL, threadWrapper, this);
}
}
/**
* Generates Key from password.
*/
-SecretKeySpec *CloudComm::initKey() {
+AESKey *CloudComm::initKey() {
try {
- PBEKeySpec *keyspec = new PBEKeySpec(password->internalBytes(),
- salt,
- 65536,
- 128);
- SecretKey *tmpkey = SecretKeyFactory_getInstance("PBKDF2WithHmacSHA256")->generateSecret(keyspec);
- return new SecretKeySpec(tmpkey->getEncoded(), "AES");
+ AESKey *key = new AESKey(password->internalBytes(),
+ salt,
+ 65536,
+ 128);
+ return key;
} catch (Exception *e) {
throw new Error("Failed generating key.");
}
try {
key = initKey();
password = NULL;// drop password
- mac = Mac_getInstance("HmacSHA256");
+ mac = new Mac();
mac->init(key);
} catch (Exception *e) {
throw new Error("Failed To Initialize Ciphers");
/*
* Builds the URL for the given request.
*/
-URL *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
+IoTString *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
const char *reqstring = isput ? "req=putslot" : "req=getslot";
char *buffer = (char *) malloc(baseurl->length() + 200);
memcpy(buffer, baseurl->internalBytes(), baseurl->length());
if (maxentries != 0)
sprintf(&buffer[offset], "&max=%" PRId64, maxentries);
IoTString *urlstr = new IoTString(buffer);
- free(buffer);
- return new URL(urlstr);
+ return urlstr;
+}
+
+int openURL(IoTString *url, bool isPost) {
+ return 0;
+}
+
+int createSocket(IoTString *host, int port) {
+ return 0;
+}
+
+int createSocket(int port) {
+ return 0;
+}
+
+int acceptSocket(int socket) {
+ return 0;
+}
+
+void writeSocketData(int fd, Array<char> *data) {}
+
+void writeSocketInt(int fd, int value) {}
+
+int readSocketInt(int fd) {return 0;}
+
+void readSocketData(int fd, Array<char> *data) {}
+
+void writeURLData(int fd, Array<char> *data) {
+}
+
+void readURLData(int fd, Array<char> *output) {
+}
+
+int readURLInt(int fd) {
+ return 0;
+}
+
+int getResponseCode(int fd) {
+ return 0;
}
void CloudComm::setSalt() {
return;
}
+ int fd = -1;
try {
Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
random->nextBytes(saltTmp);
IoTString *urlstr = new IoTString(buffer);
free(buffer);
- URL *url = new URL(urlstr);
timer->startTime();
- URLConnection *con = url->openConnection();
- HttpURLConnection *http = (HttpURLConnection *) con;
-
- http->setRequestMethod("POST");
- http->setFixedLengthStreamingMode(saltTmp->length());
- http->setDoOutput(true);
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
- http->connect();
+ fd = openURL(urlstr, true);
+ writeURLData(fd, saltTmp);
- OutputStream *os = http->getOutputStream();
- os->write(saltTmp);
- os->flush();
-
- int responsecode = http->getResponseCode();
+ int responsecode = getResponseCode(fd);
if (responsecode != HttpURLConnection_HTTP_OK) {
throw new Error("Invalid response");
}
}
bool CloudComm::getSalt() {
- URL *url = NULL;
- URLConnection *con = NULL;
- HttpURLConnection *http = NULL;
+ int fd = -1;
+ IoTString *urlstr = NULL;
try {
char *buffer = (char *) malloc(baseurl->length() + 100);
memcpy(buffer, baseurl->internalBytes(), baseurl->length());
int offset = baseurl->length();
offset += sprintf(&buffer[offset], "?req=getsalt");
- IoTString *urlstr = new IoTString(buffer);
+ urlstr = new IoTString(buffer);
free(buffer);
-
- url = new URL(urlstr);
} catch (Exception *e) {
throw new Error("getSlot failed");
}
try {
timer->startTime();
- con = url->openConnection();
- http = (HttpURLConnection *) con;
- http->setRequestMethod("POST");
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
- http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
- http->connect();
+ fd = openURL(urlstr, true);
timer->endTime();
} catch (SocketTimeoutException *e) {
timer->endTime();
try {
timer->startTime();
- int responsecode = http->getResponseCode();
+ int responsecode = getResponseCode(fd);
if (responsecode != HttpURLConnection_HTTP_OK) {
throw new Error("Invalid response");
}
- InputStream *is = http->getInputStream();
- if (is->available() > 0) {
- DataInputStream *dis = new DataInputStream(is);
- int salt_length = dis->readInt();
- Array<char> *tmp = new Array<char>(salt_length);
- dis->readFully(tmp);
- salt = tmp;
- timer->endTime();
- return true;
- } else {
- timer->endTime();
- return false;
- }
+ int salt_length = readURLInt(fd);
+ Array<char> *tmp = new Array<char>(salt_length);
+ readURLData(fd, tmp);
+ salt = tmp;
+ timer->endTime();
+ return true;
} catch (SocketTimeoutException *e) {
timer->endTime();
throw new ServerException("getSalt failed", ServerException_TypeInputTimeout);
return buffer->array();
}
+Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
+ Array<char> * output=new Array<char>(data->length());
+ aes_encrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *) output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+ return output;
+}
+
+Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
+ Array<char> * output=new Array<char>(data->length());
+ aes_decrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *)output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+ return output;
+}
+
Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
try {
- IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes);
- Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding");
- cipher->init(Cipher_ENCRYPT_MODE, key, ivSpec);
- Array<char> *encryptedBytes = cipher->doFinal(rawData);
+ Array<char> *encryptedBytes = AESEncrypt(ivBytes, key, rawData);
Array<char> *chars = new Array<char>(encryptedBytes->length() + CloudComm_IV_SIZE);
System_arraycopy(ivBytes, 0, chars, 0, ivBytes->length());
System_arraycopy(encryptedBytes, 0, chars, CloudComm_IV_SIZE, encryptedBytes->length());
Array<char> *ivBytes = new Array<char>(CloudComm_IV_SIZE);
Array<char> *encryptedBytes = new Array<char>(rawData->length() - CloudComm_IV_SIZE);
System_arraycopy(rawData, 0, ivBytes, 0, CloudComm_IV_SIZE);
- System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length);
- IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes);
- Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding");
- cipher->init(Cipher_DECRYPT_MODE, key, ivSpec);
- return cipher->doFinal(encryptedBytes);
+ System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length());
+ return AESDecrypt(ivBytes, key, encryptedBytes);
} catch (Exception *e) {
throw new Error("Failed To Decrypt");
}
* numbers.
*/
Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
+ int fd = -1;
try {
if (salt == NULL) {
if (!getSalt()) {
int64_t sequencenumber = slot->getSequenceNumber();
Array<char> *slotBytes = slot->encode(mac);
Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());
- URL *url = buildRequest(true, sequencenumber, max);
+ IoTString *url = buildRequest(true, sequencenumber, max);
timer->startTime();
- URLConnection *con = url->openConnection();
- HttpURLConnection *http = (HttpURLConnection *) con;
- http->setRequestMethod("POST");
- http->setFixedLengthStreamingMode(chars->length);
- http->setDoOutput(true);
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
- http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
- http->connect();
- OutputStream *os = http->getOutputStream();
- os->write(chars);
- os->flush();
+ fd = openURL(url, true);
+ writeURLData(fd, chars);
timer->endTime();
} catch (ServerException *e) {
timer->endTime();
try {
timer->startTime();
- InputStream *is = http->getInputStream();
- DataInputStream *dis = new DataInputStream(is);
Array<char> *resptype = new Array<char>(7);
- dis->readFully(resptype);
+ readURLData(fd, resptype);
timer->endTime();
- if (Arrays->equals(resptype, "getslot"->getBytes())) {
- return processSlots(dis);
- } else if (Arrays->equals(resptype, "putslot"->getBytes())) {
+ if (resptype->equals(getslot)) {
+ return processSlots(fd);
+ } else if (resptype->equals(putslot)) {
return NULL;
} else
throw new Error("Bad response to putslot");
} catch (SocketTimeoutException *e) {
timer->endTime();
- throw new ServerException("putSlot failed", ServerException->TypeInputTimeout);
+ throw new ServerException("putSlot failed", ServerException_TypeInputTimeout);
} catch (Exception *e) {
throw new Error("putSlot failed");
}
* sequencenumber or newer->
*/
Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
+ int fd = -1;
try {
if (salt == NULL) {
if (!getSalt()) {
initCrypt();
}
- URL *url = buildRequest(false, sequencenumber, 0);
+ IoTString *url = buildRequest(false, sequencenumber, 0);
timer->startTime();
- URLConnection *con = url->openConnection();
- HttpURLConnection *http = (HttpURLConnection *) con;
- http->setRequestMethod("POST");
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
- http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
- http->connect();
+ fd = openURL(url, true);
timer->endTime();
} catch (SocketTimeoutException *e) {
timer->endTime();
try {
timer->startTime();
- InputStream *is = http->getInputStream();
- DataInputStream *dis = new DataInputStream(is);
Array<char> *resptype = new Array<char>(7);
- dis->readFully(resptype);
+ readURLData(fd, resptype);
timer->endTime();
- if (!resptype->equals("getslot"->getBytes()))
- throw new Error("Bad Response: " + new String(resptype));
+ if (!resptype->equals(getslot))
+ throw new Error("Bad Response: ");
- return processSlots(dis);
+ return processSlots(fd);
} catch (SocketTimeoutException *e) {
timer->endTime();
throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
* Method that actually handles building Slot objects from the
* server response. Shared by both putSlot and getSlots.
*/
-Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
- int numberofslots = dis->readInt();
+Array<Slot *> *CloudComm::processSlots(int fd) {
+ int numberofslots = readURLInt(fd);
Array<int> *sizesofslots = new Array<int>(numberofslots);
Array<Slot *> *slots = new Array<Slot *>(numberofslots);
for (int i = 0; i < numberofslots; i++)
- sizesofslots->set(i, dis->readInt());
+ sizesofslots->set(i, readURLInt(fd));
for (int i = 0; i < numberofslots; i++) {
Array<char> *rawData = new Array<char>(sizesofslots->get(i));
- dis->readFully(rawData);
+ readURLData(fd, rawData);
Array<char> *data = stripIVAndDecryptSlot(rawData);
slots->set(i, Slot_decode(table, data, mac));
}
- dis->close();
return slots;
}
-Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, String host, int port) {
+Array<char> *CloudComm::sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, IoTString *host, int port) {
if (salt == NULL)
return NULL;
try {
printf("Passing Locally\n");
- mac->update(sendData);
+ mac->update(sendData, 0, sendData->length());
Array<char> *genmac = mac->doFinal();
Array<char> *totalData = new Array<char>(sendData->length() + genmac->length());
System_arraycopy(sendData, 0, totalData, 0, sendData->length());
Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
// Open a TCP socket connection to a local device
- Socket *socket = new Socket(host, port);
- socket->setReuseAddress(true);
- DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
- DataInputStream *input = new DataInputStream(socket->getInputStream());
+ int socket = createSocket(host, port);
timer->startTime();
// Send data to output (length of data, the data)
- output->writeInt(encryptedData->length);
- output->write(encryptedData, 0, encryptedData->length);
- output->flush();
+ writeSocketInt(socket, encryptedData->length());
+ writeSocketData(socket, encryptedData);
- int lengthOfReturnData = input->readInt();
+ int lengthOfReturnData = readSocketInt(socket);
Array<char> *returnData = new Array<char>(lengthOfReturnData);
- input->readFully(returnData);
+ readSocketData(socket, returnData);
timer->endTime();
returnData = stripIVAndDecryptSlot(returnData);
// We are done with this socket
- socket->close();
- mac->update(returnData, 0, returnData->length - HMAC_SIZE);
+ close(socket);
+ mac->update(returnData, 0, returnData->length() - CloudComm_HMAC_SIZE);
Array<char> *realmac = mac->doFinal();
- Array<char> *recmac = new Array<char>(HMAC_SIZE);
- System_arraycopy(returnData, returnData->length - realmac->length, recmac, 0, realmac->length);
+ Array<char> *recmac = new Array<char>(CloudComm_HMAC_SIZE);
+ System_arraycopy(returnData, returnData->length() - realmac->length(), recmac, 0, realmac->length());
if (!recmac->equals(realmac))
throw new Error("Local Error: Invalid HMAC! Potential Attack!");
Array<char> *returnData2 = new Array<char>(lengthOfReturnData - recmac->length());
- System_arraycopy(returnData, 0, returnData2, 0, returnData2->length);
+ System_arraycopy(returnData, 0, returnData2, 0, returnData2->length());
return returnData2;
} catch (Exception *e) {
}
void CloudComm::localServerWorkerFunction() {
- ServerSocket *inputSocket = NULL;
+ int inputSocket = -1;
try {
// Local server socket
- inputSocket = new ServerSocket(listeningPort);
- inputSocket->setReuseAddress(true);
- inputSocket->setSoTimeout(CloudComm_TIMEOUT_MILLIS);
+ inputSocket = createSocket(listeningPort);
} catch (Exception *e) {
throw new Error("Local server setup failure...");
}
while (!doEnd) {
try {
// Accept incoming socket
- Socket *socket = inputSocket->accept();
- DataInputStream *input = new DataInputStream(socket->getInputStream());
- DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
+ int socket = acceptSocket(inputSocket);
// Get the encrypted data from the server
- int dataSize = input->readInt();
+ int dataSize = readSocketInt(socket);
Array<char> *readData = new Array<char>(dataSize);
- input->readFully(readData);
+ readSocketData(socket, readData);
timer->endTime();
// Decrypt the data
readData = stripIVAndDecryptSlot(readData);
- mac->update(readData, 0, readData->length - HMAC_SIZE);
+ mac->update(readData, 0, readData->length() - CloudComm_HMAC_SIZE);
Array<char> *genmac = mac->doFinal();
- Array<char> *recmac = new Array<char>(HMAC_SIZE);
+ Array<char> *recmac = new Array<char>(CloudComm_HMAC_SIZE);
System_arraycopy(readData, readData->length() - recmac->length(), recmac, 0, recmac->length());
if (!recmac->equals(genmac))
// Process the data
Array<char> *sendData = table->acceptDataFromLocal(returnData);
- mac->update(sendData);
+ mac->update(sendData, 0, sendData->length());
Array<char> *realmac = mac->doFinal();
Array<char> *totalData = new Array<char>(sendData->length() + realmac->length());
System_arraycopy(sendData, 0, totalData, 0, sendData->length());
timer->startTime();
// Send data to output (length of data, the data)
- output->writeInt(encryptedData->length());
- output->write(encryptedData, 0, encryptedData->length());
- output->flush();
-
- // close the socket
- socket->close();
+ writeSocketInt(socket, encryptedData->length());
+ writeSocketData(socket, encryptedData);
+ close(socket);
} catch (Exception *e) {
}
}
- if (inputSocket != NULL) {
+ if (inputSocket != -1) {
try {
- inputSocket->close();
+ close(inputSocket);
} catch (Exception *e) {
throw new Error("Local server close failure...");
}
}
}
-void CloudComm::close() {
+void CloudComm::closeCloud() {
doEnd = true;
if (localServerThread != NULL) {
- try {
- localServerThread->join();
- } catch (Exception *e) {
+ if (pthread_join(localServerThread, NULL) != 0)
throw new Error("Local Server thread join issue...");
- }
}
}
projects / iotcloud.git / blobdiff