#include "IoTString.h"
#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/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <unistd.h>
+#include <netdb.h>
/**
* Empty Constructor needed for child class.
salt(NULL),
table(NULL),
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.
*/
baseurl(_baseurl),
key(NULL),
mac(NULL),
- password(_password),
+ password(new IoTString(_password)),
random(new SecureRandom()),
salt(NULL),
table(_table),
listeningPort(_listeningPort),
- localServerThread(NULL),
doEnd(false),
- timer(TimingSingleton_getInstance()) {
+ timer(TimingSingleton_getInstance()),
+ getslot(new Array<char>("getslot", 7)),
+ putslot(new Array<char>("putslot", 7)) {
if (listeningPort > 0) {
- localServerThread = new Thread(new Runnable() {
- void run() {
- localServerWorkerFunction();
- }
- });
- localServerThread->start();
+ pthread_create(&localServerThread, NULL, threadWrapper, this);
}
}
+CloudComm::~CloudComm() {
+ delete random;
+ delete getslot;
+ delete putslot;
+}
+
/**
* 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();
+ delete password;
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 *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()->internalArray(), 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() {
+void loopWrite(int fd, char *array, int bytestowrite) {
+ int byteswritten = 0;
+ while (bytestowrite) {
+ int bytes = write(fd, &array[byteswritten], bytestowrite);
+ if (bytes >= 0) {
+ byteswritten += bytes;
+ bytestowrite -= bytes;
+ } else {
+ printf("Error in write\n");
+ exit(-1);
+ }
+ }
+}
- if (salt != NULL) {
- // Salt already sent to server so dont set it again
- return;
+void loopRead(int fd, char *array, int bytestoread) {
+ int bytesread = 0;
+ while (bytestoread) {
+ int bytes = read(fd, &array[bytesread], bytestoread);
+ if (bytes >= 0) {
+ bytesread += bytes;
+ bytestoread -= bytes;
+ } else {
+ printf("Error in read\n");
+ exit(-1);
+ }
}
+}
- try {
- Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
- random->nextBytes(saltTmp);
+WebConnection openURL(IoTString *url) {
+ if (url->length() < 7 || memcmp(url->internalBytes()->internalArray(), "http://", 7)) {
+ printf("BOGUS URL\n");
+ exit(-1);
+ }
+ int i = 7;
+ for (; i < url->length(); i++)
+ if (url->get(i) == '/')
+ break;
+
+ if ( i == url->length()) {
+ printf("ERROR in openURL\n");
+ exit(-1);
+ }
- for (int i = 0; i < CloudComm_SALT_SIZE; i++) {
- printf("%d\n", (int)saltTmp->get(i) & 255);
- }
+ char *host = (char *) malloc(i - 6);
+ memcpy(host, &url->internalBytes()->internalArray()[7], i - 7);
+ host[i - 7] = 0;
+ printf("%s\n", host);
+ char *message = (char *)malloc(sizeof("POST HTTP/1.1\r\n") + sizeof("Host: \r\n") + 2 * url->length());
- URL* url = new URL(baseurl + "?req=setsalt");
+ /* fill in the parameters */
+ int post = sprintf(message,"POST ");
+ /* copy data */
+ memcpy(&message[post], &url->internalBytes()->internalArray()[i], url->length() - i);
+ int endpost = sprintf(&message[post + url->length() - i], " HTTP/1.1\r\n");
- timer->startTime();
- URLConnection con = url->openConnection();
- HttpURLConnection http = (HttpURLConnection) con;
+ int hostlen = sprintf(&message[endpost + post + url->length() - i], "Host: ");
+ memcpy(&message[endpost + post + url->length() + hostlen - i], host, i - 7);
+ sprintf(&message[endpost + post + url->length() + hostlen - 7], "\r\n");
+
+ /* create the socket */
+ int sockfd = socket(AF_INET, SOCK_STREAM, 0);
+ if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}
+
+ /* lookup the ip address */
+ struct hostent *server = gethostbyname(host);
+ free(host);
+
+ if (server == NULL) {printf("ERROR, no such host"); exit(-1);}
+
+ /* fill in the structure */
+ struct sockaddr_in serv_addr;
+
+ memset(&serv_addr,0,sizeof(serv_addr));
+ serv_addr.sin_family = AF_INET;
+ serv_addr.sin_port = htons(80);
+ memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);
+
+ /* connect the socket */
+ if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
+ printf("ERROR connecting");
+ exit(-1);
+ }
+
+ /* send the request */
+ int total = strlen(message);
+ loopWrite(sockfd, message, total);
+ return (WebConnection) {sockfd, -1};
+}
+
+int createSocket(IoTString *name, int port) {
+ char *host = (char *) malloc(name->length() + 1);
+ memcpy(host, name->internalBytes()->internalArray(), name->length());
+ host[name->length()] = 0;
+ printf("%s\n", host);
+ /* How big is the message? */
+
+ /* create the socket */
+ int sockfd = socket(AF_INET, SOCK_STREAM, 0);
+ if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}
+
+ /* lookup the ip address */
+ struct hostent *server = gethostbyname(host);
+ free(host);
+
+ if (server == NULL) {printf("ERROR, no such host"); exit(-1);}
+
+ /* fill in the structure */
+ struct sockaddr_in serv_addr;
+
+ memset(&serv_addr,0,sizeof(serv_addr));
+ serv_addr.sin_family = AF_INET;
+ serv_addr.sin_port = htons(port);
+ memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);
+
+ /* connect the socket */
+ if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
+ printf("ERROR connecting");
+ exit(-1);
+ }
- http->setRequestMethod("POST");
- http->setFixedLengthStreamingMode(saltTmp->length());
- http->setDoOutput(true);
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
+ return sockfd;
+}
+int createSocket(int port) {
+ int fd;
+ struct sockaddr_in sin;
+
+ bzero(&sin, sizeof(sin));
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(port);
+ sin.sin_addr.s_addr = htonl(INADDR_ANY);
+ fd = socket(AF_INET, SOCK_STREAM, 0);
+ int n = 1;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&n, sizeof (n)) < 0) {
+ close(fd);
+ printf("Create Socket Error\n");
+ exit(-1);
+ }
+ if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+ close(fd);
+ exit(-1);
+ }
+ if (listen(fd, 5) < 0) {
+ close(fd);
+ exit(-1);
+ }
+ return fd;
+}
- http->connect();
+int acceptSocket(int socket) {
+ struct sockaddr_in sin;
+ unsigned int sinlen = sizeof(sin);
+ int newfd = accept(socket, (struct sockaddr *)&sin, &sinlen);
+ int flag = 1;
+ setsockopt(newfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(flag));
+ if (newfd < 0) {
+ printf("Accept Error\n");
+ exit(-1);
+ }
+ return newfd;
+}
- OutputStream* os = http->getOutputStream();
- os->write(saltTmp);
- os->flush();
+void writeSocketData(int fd, Array<char> *data) {
+ loopWrite(fd, data->internalArray(), data->length());
+}
+
+void writeSocketInt(int fd, int32_t value) {
+ char array[4];
+ array[0] = value >> 24;
+ array[1] = (value >> 16) & 0xff;
+ array[2] = (value >> 8) & 0xff;
+ array[3] = value & 0xff;
+ loopWrite(fd, array, 4);
+}
+
+int readSocketInt(int fd) {
+ char array[4];
+ loopRead(fd, array, 4);
+ return (((int32_t)(unsigned char) array[0]) << 24) |
+ (((int32_t)(unsigned char) array[1]) << 16) |
+ (((int32_t)(unsigned char) array[2]) << 8) |
+ ((int32_t)(unsigned char) array[3]);
+}
+
+void readSocketData(int fd, Array<char> *data) {
+ loopRead(fd, data->internalArray(), data->length());
+}
+
+void writeURLDataAndClose(WebConnection *wc, Array<char> *data) {
+ dprintf(wc->fd, "Content-Length: %d\r\n\r\n", data->length());
+ loopWrite(wc->fd, data->internalArray(), data->length());
+}
+
+void closeURLReq(WebConnection *wc) {
+ dprintf(wc->fd, "\r\n");
+}
+
+void readURLData(WebConnection *wc, Array<char> *output) {
+ loopRead(wc->fd, output->internalArray(), output->length());
+}
- int responsecode = http->getResponseCode();
- if (responsecode != HttpURLConnection.HTTP_OK) {
- // TODO: Remove this print
- System.out.println(responsecode);
+int readURLInt(WebConnection *wc) {
+ char array[4];
+ loopRead(wc->fd, array, 4);
+ return (((int32_t)(unsigned char) array[0]) << 24) |
+ (((int32_t)(unsigned char) array[1]) << 16) |
+ (((int32_t)(unsigned char) array[2]) << 8) |
+ ((int32_t)(unsigned char) array[3]);
+}
+
+void readLine(WebConnection *wc, char *response, int numBytes) {
+ int offset = 0;
+ char newchar;
+ while (true) {
+ int bytes = read(wc->fd, &newchar, 1);
+ if (bytes <= 0)
+ break;
+ if (offset == (numBytes - 1)) {
+ printf("Response too long");
+ exit(-1);
+ }
+ response[offset++] = newchar;
+ if (newchar == '\n')
+ break;
+ }
+ response[offset] = 0;
+}
+
+int getResponseCode(WebConnection *wc) {
+ char response[600];
+ readLine(wc, response, sizeof(response));
+ int ver1 = 0, ver2 = 0, respcode = 0;
+ sscanf(response, "HTTP/%d.%d %d", &ver1, &ver2, &respcode);
+ printf("Response code %d\n", respcode);
+ return respcode;
+}
+
+void readHeaders(WebConnection *wc) {
+ char response[600];
+ int numBytes;
+
+ while (true) {
+ readLine(wc, response, sizeof(response));
+ if (response[0] == '\r')
+ return;
+ else if (memcmp(response, "Content-Length:", sizeof("Content-Length:") - 1) == 0) {
+ sscanf(response, "Content-Length: %d", &numBytes);
+ wc->numBytes = numBytes;
+ }
+ }
+}
+
+void CloudComm::setSalt() {
+ if (salt != NULL) {
+ // Salt already sent to server so don't set it again
+ return;
+ }
+
+ WebConnection wc = {-1, -1};
+ try {
+ Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
+ random->nextBytes(saltTmp);
+
+ char *buffer = (char *) malloc(baseurl->length() + 100);
+ memcpy(buffer, baseurl->internalBytes()->internalArray(), baseurl->length());
+ int offset = baseurl->length();
+ offset += sprintf(&buffer[offset], "?req=setsalt");
+ IoTString *urlstr = new IoTString(buffer);
+ free(buffer);
+
+ timer->startTime();
+ wc = openURL(urlstr);
+ writeURLDataAndClose(&wc, saltTmp);
+
+ int responsecode = getResponseCode(&wc);
+ if (responsecode != HttpURLConnection_HTTP_OK) {
throw new Error("Invalid response");
}
+ close(wc.fd);
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;
+ WebConnection wc = {-1, -1};
+ IoTString *urlstr = NULL;
try {
- url = new URL(baseurl + "?req=getsalt");
+ char *buffer = (char *) malloc(baseurl->length() + 100);
+ memcpy(buffer, baseurl->internalBytes()->internalArray(), 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();
+ wc = openURL(urlstr);
+ closeURLReq(&wc);
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(&wc);
+ readHeaders(&wc);
+ 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;
+ if (wc.numBytes == 0) {
timer->endTime();
-
- return true;
- } else {
- timer->endTime();
-
+ close(wc.fd);
return false;
}
+
+
+ int salt_length = readURLInt(&wc);
+ Array<char> *tmp = new Array<char>(salt_length);
+ readURLData(&wc, tmp);
+ close(wc.fd);
+
+ salt = tmp;
+ timer->endTime();
+ return true;
} 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);
return buffer->array();
}
-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> *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->getKeySchedule(), key->getKey()->length() * 8, (BYTE *)ivBytes->internalArray());
+ return output;
+}
- Array<char> *encryptedBytes = cipher->doFinal(rawData);
+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->getKeySchedule(), key->getKey()->length() * 8, (BYTE *)ivBytes->internalArray());
+ return output;
+}
+Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
+ try {
+ Array<char> *encryptedBytes = AESEncrypt(ivBytes, key, rawData);
+ Array<char> *origBytes = AESDecrypt(ivBytes, key, encryptedBytes);
+ if (!rawData->equals(origBytes))
+ throw new Error("BAD");
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");
- 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");
}
}
-
/*
* 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) {
+ WebConnection wc = {-1, -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();
-
+ wc = openURL(url);
+ writeURLDataAndClose(&wc, 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 {
+ int respcode = getResponseCode(&wc);
+ readHeaders(&wc);
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(&wc, resptype);
timer->endTime();
- if (Arrays->equals(resptype, "getslot"->getBytes())) {
- return processSlots(dis);
- } else if (Arrays->equals(resptype, "putslot"->getBytes())) {
+ if (resptype->equals(getslot)) {
+ Array<Slot *> *tmp = processSlots(&wc);
+ close(wc.fd);
+ return tmp;
+ } else if (resptype->equals(putslot)) {
+ close(wc.fd);
return NULL;
- } else
+ } else {
+ close(wc.fd);
throw new Error("Bad response to putslot");
-
+ }
} catch (SocketTimeoutException *e) {
timer->endTime();
- throw new ServerException("putSlot failed", ServerException->TypeInputTimeout);
+ close(wc.fd);
+ 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) {
+ WebConnection wc = {-1, -1};
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;
- http->setRequestMethod("POST");
- http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
- http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
-
-
-
- http->connect();
+ wc = openURL(url);
+ closeURLReq(&wc);
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);
+ int responsecode = getResponseCode(&wc);
+ readHeaders(&wc);
Array<char> *resptype = new Array<char>(7);
-
- dis->readFully(resptype);
+ readURLData(&wc, resptype);
timer->endTime();
+ if (!resptype->equals(getslot))
+ throw new Error("Bad Response: ");
- if (!resptype->equals("getslot".getBytes()))
- throw new Error("Bad Response: " + new String(resptype));
-
- return processSlots(dis);
+ Array<Slot *> *tmp = processSlots(&wc);
+ close(wc.fd);
+ return tmp;
} catch (SocketTimeoutException *e) {
timer->endTime();
-
- throw new ServerException("getSlots failed", ServerException.TypeInputTimeout);
+ close(wc.fd);
+ 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(WebConnection *wc) {
+ int numberofslots = readURLInt(wc);
+ 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(wc));
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(wc, 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, IoTString *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->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 (!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) {
}
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());
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());
- 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 (listeningPort > 0) {
+ if (pthread_join(localServerThread, NULL) != 0)
throw new Error("Local Server thread join issue...");
- }
}
}
-
projects / iotcloud.git / blobdiff