Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add notion of server and client DTLSSessions

Browse source
This commit is contained in:
Stephen Birarda 2014-04-01 16:47:45 -07:00
parent ce6f845681
commit b5b4edc999
14 changed files with 141 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
domain-server/src/DTLSServerSession.cpp Normal file
View file

@ -0,0 +1,15 @@
//
// DTLSServerSession.cpp
// hifi
//
// Created by Stephen Birarda on 2014-04-01.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#include "DTLSServerSession.h"
DTLSServerSession::DTLSServerSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket) :
DTLSSession(GNUTLS_SERVER, dtlsSocket, destinationSocket)
{
}

19
domain-server/src/DTLSServerSession.h Normal file
View file

@ -0,0 +1,19 @@
//
// DTLSServerSession.h
// hifi
//
// Created by Stephen Birarda on 2014-04-01.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
//
#ifndef __hifi__DTLSServerSession__
#define __hifi__DTLSServerSession__
#include <DTLSSession.h>
class DTLSServerSession : public DTLSSession {
public:
DTLSServerSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket);
};
#endif /* defined(__hifi__DTLSServerSession__) */

34
domain-server/src/DomainServer.cpp
View file

@ -6,8 +6,6 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
//
#include <signal.h>
#include <QtCore/QDir>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@ -393,8 +391,12 @@ void DomainServer::addNodeToNodeListAndConfirmConnection(const QByteArray& packe
SharedNodePointer newNode = LimitedNodeList::getInstance()->addOrUpdateNode(nodeUUID, nodeType, publicSockAddr, localSockAddr);
// when the newNode is created the linked data is also created, if this was a static assignment set the UUID
reinterpret_cast<DomainServerNodeData*>(newNode->getLinkedData())->setStaticAssignmentUUID(assignmentUUID);
// when the newNode is created the linked data is also created
// if this was a static assignment set the UUID, set the sendingSockAddr
DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(newNode->getLinkedData());
nodeData->setStaticAssignmentUUID(assignmentUUID);
nodeData->setSendingSockAddr(senderSockAddr);
if (!authJsonObject.isEmpty()) {
// pull the connection secret from the authJsonObject and set it as the connection secret for this node
@ -533,7 +535,6 @@ void DomainServer::readAvailableDatagrams() {
HifiSockAddr senderSockAddr;
QByteArray receivedPacket;
static QByteArray assignmentPacket = byteArrayWithPopulatedHeader(PacketTypeCreateAssignment);
static int numAssignmentPacketHeaderBytes = assignmentPacket.size();
@ -603,7 +604,30 @@ void DomainServer::readAvailableDatagrams() {
}
void DomainServer::readAvailableDTLSDatagrams() {
LimitedNodeList* nodeList = LimitedNodeList::getInstance();
QUdpSocket& dtlsSocket = nodeList->getDTLSSocket();
static sockaddr senderSockAddr;
static socklen_t sockAddrSize = sizeof(senderSockAddr);
while (dtlsSocket.hasPendingDatagrams()) {
// check if we have an active DTLS session for this sender
QByteArray peekDatagram(dtlsSocket.pendingDatagramSize(), 0);
recvfrom(dtlsSocket.socketDescriptor(), peekDatagram.data(), dtlsSocket.pendingDatagramSize(),
MSG_PEEK, &senderSockAddr, &sockAddrSize);
DTLSSession* existingSession = _dtlsSessions.value(HifiSockAddr(&senderSockAddr));
qDebug() << "Checking for a session with" << HifiSockAddr(&senderSockAddr);
if (existingSession) {
// use GnuTLS to receive the encrypted data
} else {
// no existing session - set up a new session now
}
}
}
void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr) {

4
domain-server/src/DomainServer.h
View file

@ -23,6 +23,8 @@
#include <HTTPManager.h>
#include <NodeList.h>
#include "DTLSServerSession.h"
typedef QSharedPointer<Assignment> SharedAssignmentPointer;
class DomainServer : public QCoreApplication, public HTTPRequestHandler {
@ -88,6 +90,8 @@ private:
gnutls_certificate_credentials_t* _x509Credentials;
gnutls_dh_params_t* _dhParams;
gnutls_priority_t* _priorityCache;
QHash<HifiSockAddr, DTLSServerSession*> _dtlsSessions;
};
#endif /* defined(__hifi__DomainServer__) */

3
domain-server/src/DomainServerNodeData.cpp
View file

@ -17,7 +17,8 @@
DomainServerNodeData::DomainServerNodeData() :
_sessionSecretHash(),
_staticAssignmentUUID(),
_statsJSONObject()
_statsJSONObject(),
_sendingSockAddr()
{
}

5
domain-server/src/DomainServerNodeData.h
View file

@ -12,6 +12,7 @@
#include <QtCore/QHash>
#include <QtCore/QUuid>
#include <HifiSockAddr.h>
#include <NodeData.h>
class DomainServerNodeData : public NodeData {
@ -26,6 +27,9 @@ public:
void setStaticAssignmentUUID(const QUuid& staticAssignmentUUID) { _staticAssignmentUUID = staticAssignmentUUID; }
const QUuid& getStaticAssignmentUUID() const { return _staticAssignmentUUID; }
void setSendingSockAddr(const HifiSockAddr& sendingSockAddr) { _sendingSockAddr = sendingSockAddr; }
const HifiSockAddr& getSendingSockAddr() { return _sendingSockAddr; }
QHash<QUuid, QUuid>& getSessionSecretHash() { return _sessionSecretHash; }
private:
QJsonObject mergeJSONStatsFromNewObject(const QJsonObject& newObject, QJsonObject destinationObject);
@ -33,6 +37,7 @@ private:
QHash<QUuid, QUuid> _sessionSecretHash;
QUuid _staticAssignmentUUID;
QJsonObject _statsJSONObject;
HifiSockAddr _sendingSockAddr;
};
#endif /* defined(__hifi__DomainServerNodeData__) */

15
libraries/shared/src/DTLSClientSession.cpp Normal file
View file

@ -0,0 +1,15 @@
//
// DTLSClientSession.cpp
// hifi
//
// Created by Stephen Birarda on 2014-04-01.
// Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
//
#include "DTLSClientSession.h"
DTLSClientSession::DTLSClientSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket) :
DTLSSession(GNUTLS_CLIENT, dtlsSocket, destinationSocket)
{
}

19
libraries/shared/src/DTLSClientSession.h Normal file
View file

@ -0,0 +1,19 @@
//
// DTLSClientSession.h
// hifi
//
// Created by Stephen Birarda on 2014-04-01.
// Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
//
#ifndef __hifi__DTLSClientSession__
#define __hifi__DTLSClientSession__
#include "DTLSSession.h"
class DTLSClientSession : public DTLSSession {
public:
DTLSClientSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket);
};
#endif /* defined(__hifi__DTLSClientSession__) */

20
libraries/shared/src/DTLSSession.cpp
View file

@ -34,7 +34,7 @@ ssize_t DTLSSession::socketPush(gnutls_transport_ptr_t ptr, const void* buffer,
session->_destinationSocket.getAddress(), session->_destinationSocket.getPort());
}
static gnutls_certificate_credentials_t* x509ClientCredentials() {
gnutls_certificate_credentials_t* x509CACredentials() {
static gnutls_certificate_credentials_t x509Credentials;
static bool credentialsInitialized = false;
@ -45,23 +45,9 @@ static gnutls_certificate_credentials_t* x509ClientCredentials() {
return &x509Credentials;
}
DTLSSession::DTLSSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket) :
DTLSSession::DTLSSession(int end, QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket) :
_dtlsSocket(dtlsSocket),
_destinationSocket(destinationSocket)
{
qDebug() << "Initializing DTLS Session.";
gnutls_init(&_gnutlsSession, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
gnutls_priority_set_direct(_gnutlsSession, "NORMAL", NULL);
gnutls_credentials_set(_gnutlsSession, GNUTLS_CRD_CERTIFICATE, x509ClientCredentials());
// tell GnuTLS to call us for push or pull
gnutls_transport_set_ptr(_gnutlsSession, this);
gnutls_transport_set_push_function(_gnutlsSession, socketPush);
gnutls_transport_set_pull_function(_gnutlsSession, socketPull);
gnutls_transport_set_pull_timeout_function(_gnutlsSession, socketPullTimeout);
// start the handshake process with domain-server now
gnutls_handshake(_gnutlsSession);
gnutls_init(&_gnutlsSession, end | GNUTLS_DATAGRAM);
}

9
libraries/shared/src/DTLSSession.h
View file

@ -15,13 +15,16 @@
#include "HifiSockAddr.h"
class DTLSSession {
class DTLSSession : public QObject {
Q_OBJECT
public:
DTLSSession(QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket);
private:
DTLSSession(int end, QUdpSocket& dtlsSocket, HifiSockAddr& destinationSocket);
protected:
static int socketPullTimeout(gnutls_transport_ptr_t ptr, unsigned int ms);
static ssize_t socketPull(gnutls_transport_ptr_t ptr, void* buffer, size_t size);
static ssize_t socketPush(gnutls_transport_ptr_t ptr, const void* buffer, size_t size);
static gnutls_certificate_credentials_t* x509CACredentials();
QUdpSocket& _dtlsSocket;
gnutls_session_t _gnutlsSession;

2
libraries/shared/src/DomainHandler.cpp
View file

@ -42,7 +42,7 @@ void DomainHandler::reset() {
void DomainHandler::initializeDTLSSession() {
if (!_dtlsSession) {
_dtlsSession = new DTLSSession(NodeList::getInstance()->getDTLSSocket(), _sockAddr);
_dtlsSession = new DTLSClientSession(NodeList::getInstance()->getDTLSSocket(), _sockAddr);
}
}

4
libraries/shared/src/DomainHandler.h
View file

@ -14,7 +14,7 @@
#include <QtCore/QUrl>
#include <QtNetwork/QHostInfo>
#include "DTLSSession.h"
#include "DTLSClientSession.h"
#include "HifiSockAddr.h"
const QString DEFAULT_DOMAIN_HOSTNAME = "alpha.highfidelity.io";
@ -67,7 +67,7 @@ private:
QUuid _assignmentUUID;
bool _isConnected;
bool _requiresDTLS;
DTLSSession* _dtlsSession;
DTLSClientSession* _dtlsSession;
};
#endif /* defined(__hifi__DomainHandler__) */

19
libraries/shared/src/HifiSockAddr.cpp
View file

@ -6,12 +6,14 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
//
#include "HifiSockAddr.h"
#include <netinet/in.h>
#include <QtCore/QDataStream>
#include <QtNetwork/QHostInfo>
#include <QtNetwork/QNetworkInterface>
#include "HifiSockAddr.h"
static int hifiSockAddrMetaTypeId = qMetaTypeId<HifiSockAddr>();
HifiSockAddr::HifiSockAddr() :
@ -44,6 +46,16 @@ HifiSockAddr::HifiSockAddr(const QString& hostname, quint16 hostOrderPort) {
}
}
HifiSockAddr::HifiSockAddr(const sockaddr* sockaddr) {
_address = QHostAddress(sockaddr);
if (sockaddr->sa_family == AF_INET) {
_port = reinterpret_cast<const sockaddr_in*>(sockaddr)->sin_port;
} else {
_port = reinterpret_cast<const sockaddr_in6*>(sockaddr)->sin6_port;
}
}
HifiSockAddr& HifiSockAddr::operator=(const HifiSockAddr& rhsSockAddr) {
_address = rhsSockAddr._address;
_port = rhsSockAddr._port;
@ -109,3 +121,8 @@ quint32 getHostOrderLocalAddress() {
// return the looked up local address
return localAddress;
}
uint qHash(const HifiSockAddr& key, uint seed) {
// use the existing QHostAddress and quint16 hash functions to get our hash
return qHash(key.getAddress(), seed) + qHash(key.getPort(), seed);
}

3
libraries/shared/src/HifiSockAddr.h
View file

@ -17,6 +17,7 @@ public:
HifiSockAddr(const QHostAddress& address, quint16 port);
HifiSockAddr(const HifiSockAddr& otherSockAddr);
HifiSockAddr(const QString& hostname, quint16 hostOrderPort);
HifiSockAddr(const sockaddr* sockaddr);
bool isNull() const { return _address.isNull() && _port == 0; }
@ -45,6 +46,8 @@ private:
quint16 _port;
};
uint qHash(const HifiSockAddr& key, uint seed);
quint32 getHostOrderLocalAddress();
Q_DECLARE_METATYPE(HifiSockAddr)