#include "IoTString.h"
#include "Error.h"
#include "URL.h"
+#include "Mac.h"
+#include "Table.h"
+#include "Crypto.h"
+#include "ByteBuffer.h"
/**
* Empty Constructor needed for child class.
{
}
+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.");
}
* Inits the HMAC generator.
*/
void CloudComm::initCrypt() {
-
if (password == NULL) {
return;
}
-
try {
key = initKey();
password = NULL;// drop password
/*
* Builds the URL for the given request.
*/
-URL *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
- IoTString *reqstring = isput ? "req=putslot" : "req=getslot";
- IoTString *urlstr = baseurl + "?" + reqstring + "&seq=" + sequencenumber;
+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());
+ int offset = baseurl->length();
+ offset += sprintf(&buffer[offset], "?%s&seq=%" PRId64, reqstring, sequencenumber);
if (maxentries != 0)
- urlstr += "&max=" + maxentries;
- return new URL(urlstr);
+ sprintf(&buffer[offset], "&max=%" PRId64, maxentries);
+ IoTString *urlstr = new IoTString(buffer);
+ return urlstr;
}
-void CloudComm::setSalt() {
+int openURL(IoTString *url, bool isPost) {
+ return 0;
+}
+
+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() {
if (salt != NULL) {
- // Salt already sent to server so dont set it again
+ // Salt already sent to server so don't set it again
return;
}
+ int fd = -1;
try {
Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
random->nextBytes(saltTmp);
- for (int i = 0; i < CloudComm_SALT_SIZE; i++) {
- printf("%d\n", (int)saltTmp->get(i) & 255);
- }
-
-
- URL* url = new URL(baseurl + "?req=setsalt");
+ char *buffer = (char *) malloc(baseurl->length() + 100);
+ memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+ int offset = baseurl->length();
+ offset += sprintf(&buffer[offset], "?req=setsalt");
+ IoTString *urlstr = new IoTString(buffer);
+ free(buffer);
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();
-
- OutputStream* os = http->getOutputStream();
- os->write(saltTmp);
- os->flush();
+ fd = openURL(urlstr, true);
+ writeURLData(fd, saltTmp);
- int responsecode = http->getResponseCode();
- if (responsecode != HttpURLConnection.HTTP_OK) {
- // TODO: Remove this print
- System.out.println(responsecode);
+ int responsecode = getResponseCode(fd);
+ if (responsecode != HttpURLConnection_HTTP_OK) {
throw new Error("Invalid response");
}
timer->endTime();
-
salt = saltTmp;
} catch (Exception *e) {
timer->endTime();
- throw new ServerException("Failed setting salt", ServerException.TypeConnectTimeout);
+ throw new ServerException("Failed setting salt", ServerException_TypeConnectTimeout);
}
}
bool CloudComm::getSalt() {
- URL *url = NULL;
- URLConnection *con = NULL;
- HttpURLConnection *http = NULL;
-
+ int fd = -1;
+ IoTString *urlstr = NULL;
+
try {
- url = new URL(baseurl + "?req=getsalt");
+ char *buffer = (char *) malloc(baseurl->length() + 100);
+ memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+ int offset = baseurl->length();
+ offset += sprintf(&buffer[offset], "?req=getsalt");
+ urlstr = new IoTString(buffer);
+ free(buffer);
} 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();
- throw new ServerException("getSalt failed", ServerException.TypeConnectTimeout);
+ throw new ServerException("getSalt failed", ServerException_TypeConnectTimeout);
} catch (Exception *e) {
throw new Error("getSlot failed");
}
try {
-
timer->startTime();
-
- int responsecode = http.getResponseCode();
- if (responsecode != HttpURLConnection.HTTP_OK) {
- // TODO: Remove this print
- // System.out.println(responsecode);
+ 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);
+ int salt_length = readURLInt(fd);
+ Array<char> *tmp = new Array<char>(salt_length);
+ readURLData(fd, tmp);
salt = tmp;
timer->endTime();
-
return true;
} else {
timer->endTime();
-
return false;
}
} catch (SocketTimeoutException *e) {
timer->endTime();
-
- throw new ServerException("getSalt failed", ServerException.TypeInputTimeout);
+ throw new ServerException("getSalt failed", ServerException_TypeInputTimeout);
} catch (Exception *e) {
throw new Error("getSlot failed");
}
}
Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber) {
- ByteBuffer buffer = ByteBuffer.allocate(CloudComm_IV_SIZE);
+ ByteBuffer *buffer = ByteBuffer_allocate(CloudComm_IV_SIZE);
buffer->putLong(machineId);
int64_t localSequenceNumberShifted = localSequenceNumber << 16;
buffer->putLong(localSequenceNumberShifted);
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);
-
+ 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> *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);
+ System_arraycopy(ivBytes, 0, chars, 0, ivBytes->length());
+ System_arraycopy(encryptedBytes, 0, chars, CloudComm_IV_SIZE, encryptedBytes->length());
return chars;
-
} catch (Exception *e) {
throw new Error("Failed To Encrypt");
}
}
-
Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
try {
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");
+ 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);
-
} catch (Exception *e) {
throw new Error("Failed To Decrypt");
}
}
-
/*
* API for putting a slot into the queue. Returns NULL on success.
* On failure, the server will send slots with newer sequence
* numbers.
*/
Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
+ int fd = -1;
try {
if (salt == NULL) {
if (!getSalt()) {
- throw new ServerException("putSlot failed", ServerException.TypeSalt);
+ throw new ServerException("putSlot failed", ServerException_TypeSalt);
}
initCrypt();
}
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();
-
throw e;
} catch (SocketTimeoutException *e) {
timer->endTime();
-
- throw new ServerException("putSlot failed", ServerException.TypeConnectTimeout);
+ throw new ServerException("putSlot failed", ServerException_TypeConnectTimeout);
} catch (Exception *e) {
throw new Error("putSlot failed");
}
-
-
try {
timer->startTime();
- InputStream is = http->getInputStream();
- DataInputStream * dis = new DataInputStream(is);
- Array<char> *resptype = new char[7];
- dis->readFully(resptype);
+ Array<char> *resptype = new Array<char>(7);
+ 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"->getBytes())) {
+ return processSlots(fd);
+ } else if (resptype->equals("putslot"->getBytes())) {
return NULL;
} else
throw new Error("Bad response to putslot");
-
} catch (SocketTimeoutException *e) {
timer->endTime();
throw new ServerException("putSlot failed", ServerException->TypeInputTimeout);
try {
if (salt == NULL) {
if (!getSalt()) {
- throw new ServerException("getSlots failed", ServerException.TypeSalt);
+ throw new ServerException("getSlots failed", ServerException_TypeSalt);
}
initCrypt();
}
- URL *url = buildRequest(false, sequencenumber, 0);
+ IoTString *url = buildRequest(false, sequencenumber, 0);
timer->startTime();
URLConnection *con = url->openConnection();
- HttpURLConnection *http = (HttpURLConnection) con;
+ HttpURLConnection *http = (HttpURLConnection *) con;
http->setRequestMethod("POST");
http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
-
-
-
http->connect();
timer->endTime();
-
} catch (SocketTimeoutException *e) {
timer->endTime();
-
- throw new ServerException("getSlots failed", ServerException.TypeConnectTimeout);
+ throw new ServerException("getSlots failed", ServerException_TypeConnectTimeout);
} 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 (!resptype->equals("getslot".getBytes()))
+ if (!resptype->equals("getslot"->getBytes()))
throw new Error("Bad Response: " + new String(resptype));
return processSlots(dis);
} catch (SocketTimeoutException *e) {
timer->endTime();
-
- throw new ServerException("getSlots failed", ServerException.TypeInputTimeout);
+ throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
} catch (Exception *e) {
throw new Error("getSlots failed");
}
* 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<int> * sizesofslots = new Array<int>(numberofslots);
+Array<Slot *> *CloudComm::processSlots(int fd) {
+ int numberofslots = readURLInt(fd);
+ Array<int> *sizesofslots = new Array<int>(numberofslots);
+ Array<Slot *> *slots = new Array<Slot *>(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);
-
-
- // Array<char> * data = new char[rawData.length - IV_SIZE];
- // System.arraycopy(rawData, IV_SIZE, data, 0, data.length);
-
-
+ readURLData(rawData);
Array<char> *data = stripIVAndDecryptSlot(rawData);
-
- // data = decryptCipher.doFinal(data);
-
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) {
- if (salt == NULL) {
+Array<char> *CloudComm::sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, String host, int port) {
+ if (salt == NULL)
return NULL;
- }
try {
- printf("Passing Locally"\m);
-
- mac->update(sendData);
+ printf("Passing Locally\n");
+ 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());
- System-arraycopy(genmac, 0, totalData, sendData.length, genmac->length());
+ System_arraycopy(sendData, 0, totalData, 0, sendData->length());
+ System_arraycopy(genmac, 0, totalData, sendData->length(), genmac->length());
// Encrypt the data for sending
Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
// Open a TCP socket connection to a local device
- Socket* socket = new Socket(host, port);
+ Socket *socket = new Socket(host, port);
socket->setReuseAddress(true);
- DataOutputStream* output = new DataOutputStream(socket->getOutputStream());
- DataInputStream* input = new DataInputStream(socket->getInputStream());
+ DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
+ DataInputStream *input = new DataInputStream(socket->getInputStream());
timer->startTime();
// Send data to output (length of data, the data)
- output->writeInt(encryptedData->length);
- output->write(encryptedData, 0, encryptedData->length);
+ output->writeInt(encryptedData->length());
+ output->write(encryptedData, 0, encryptedData->length());
output->flush();
int lengthOfReturnData = input->readInt();
Array<char> *returnData = new Array<char>(lengthOfReturnData);
input->readFully(returnData);
-
timer->endTime();
-
returnData = stripIVAndDecryptSlot(returnData);
// We are done with this socket
socket->close();
-
- mac->update(returnData, 0, returnData->length - HMAC_SIZE);
+ 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 (!Arrays->equals(recmac, realmac))
+ 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) {
try {
// Accept incoming socket
Socket *socket = inputSocket->accept();
-
DataInputStream *input = new DataInputStream(socket->getInputStream());
DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
int dataSize = input->readInt();
Array<char> *readData = new Array<char>(dataSize);
input->readFully(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());
Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
-
timer->startTime();
// Send data to output (length of data, the data)
output->writeInt(encryptedData->length());
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