#include "io/recordHandler.h"
#include <iostream>
+#include <sstream>
#include <fstream>
#include <ctime>
#include <unordered_map>
class RecordHandlerSession {
public:
- uint32_t sessid;
- uint32_t lastCommandCount;
+ uint32_t sessid = 0;
+ uint32_t lastCommandCount = 0;
std::shared_ptr<TBSCertificate> tbs;
std::shared_ptr<SignedCertificate> result;
DefaultRecordHandler* parent;
std::shared_ptr<Signer> signer;
- std::shared_ptr<std::ofstream> log;
+ std::unique_ptr<std::ofstream> logFile;
+ //std::stringstream sessionlog;
std::vector<std::string> serials;
+ logger::logger_set logger;
+
RecordHandlerSession( DefaultRecordHandler* parent, std::shared_ptr<Signer> signer, std::shared_ptr<SSL_CTX> ctx, std::shared_ptr<BIO> output ) :
- sessid( 0 ),
- lastCommandCount( 0 ),
- tbs( new TBSCertificate() ) {
+ tbs( std::make_shared<TBSCertificate>() ),
+ logFile(openLogfile( "logs/log_" + timestamp() ) ),
+ logger{ std::cout, *logFile } {
this->parent = parent;
this->signer = signer;
- time_t c_time;
-
- if( time( &c_time ) == -1 ) {
- throw "Error while fetching time?";
- }
-
- log = openLogfile( std::string( "logs/log_" ) + std::to_string( c_time ) );
ssl = std::shared_ptr<SSL>( SSL_new( ctx.get() ), SSL_free );
std::shared_ptr<BIO> bio(
SSL_set_accept_state( ssl.get() );
SSL_set_bio( ssl.get(), output.get(), output.get() );
BIO_set_ssl( bio.get(), ssl.get(), BIO_NOCLOSE );
- io = std::shared_ptr<OpensslBIOWrapper>( new OpensslBIOWrapper( bio ) );
+ io = std::make_shared<OpensslBIOWrapper>( bio );
}
void respondCommand( RecordHeader::SignerResult res, std::string payload ) {
RecordHeader rh;
- rh.command = ( uint16_t ) res;
+ rh.command = static_cast<uint16_t>( res );
rh.flags = 0;
rh.command_count = 0; // TODO i++
rh.totalLength = payload.size();
- sendCommand( rh, payload, io, log );
+ sendCommand( rh, payload, io );
}
void work() {
- std::vector<char> buffer( 2048, 0 );
- int res = io->read( buffer.data(), buffer.capacity() );
+ std::vector<char> buffer( 2048 );
+ int res = io->read( buffer.data(), buffer.size() );
if( res <= 0 ) {
logger::error( "Stream error, resetting SSL" );
try {
RecordHeader head;
- std::string payload = parseCommand( head, content, log );
+ std::string payload = parseCommand( head, content );
execute( head, payload );
} catch( const char* msg ) {
- if( log ) {
- logger::error( "ERROR: ", msg );
- }
-
+ logger::error( "ERROR: ", msg );
parent->reset();
return;
}
throw "Error, chunking not supported yet";
}
- switch( ( RecordHeader::SignerCommand ) head.command ) {
+ switch( static_cast<RecordHeader::SignerCommand>( head.command )) {
case RecordHeader::SignerCommand::SET_CSR:
tbs->csr_content = data;
tbs->csr_type = "CSR";
tbs->wishTo = data;
break;
- case RecordHeader::SignerCommand::ADD_SAN: {
- size_t pos = data.find( "," );
-
- if( pos == std::string::npos ) {
- // error
- } else {
- std::shared_ptr<SAN> san( new SAN() );
- san->type = data.substr( 0, pos );
- san->content = data.substr( pos + 1 );
- tbs->SANs.push_back( san );
+ case RecordHeader::SignerCommand::ADD_SAN:
+ {
+ size_t pos = data.find( "," );
+
+ if( pos == std::string::npos ) {
+ // error
+ } else {
+ auto san = std::make_shared<SAN>();
+ san->type = data.substr( 0, pos );
+ san->content = data.substr( pos + 1 );
+ tbs->SANs.push_back( san );
+ }
}
- }
- break;
-
- case RecordHeader::SignerCommand::ADD_AVA: {
- size_t pos = data.find( "," );
-
- if( pos == std::string::npos ) {
- // error
- } else {
- std::shared_ptr<AVA> ava( new AVA() );
- ava->name = data.substr( 0, pos );
- ava->value = data.substr( pos + 1 );
- tbs->AVAs.push_back( ava );
+ break;
+
+ case RecordHeader::SignerCommand::ADD_AVA:
+ {
+ size_t pos = data.find( "," );
+
+ if( pos == std::string::npos ) {
+ // error
+ } else {
+ auto ava = std::make_shared<AVA>();
+ ava->name = data.substr( 0, pos );
+ ava->value = data.substr( pos + 1 );
+ tbs->AVAs.push_back( ava );
+ }
}
- }
- break;
+ break;
case RecordHeader::SignerCommand::ADD_PROOF_LINE:
break;
serials.push_back( data );
break;
- case RecordHeader::SignerCommand::REVOKE: {
- std::string ca = data;
- auto reqCA = CAs.at( ca );
- logger::note( "CA found" );
- std::shared_ptr<CRL> crl;
- std::string date;
- std::tie<std::shared_ptr<CRL>, std::string>( crl, date ) = signer->revoke( reqCA, serials );
-
- respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() );
-
+ case RecordHeader::SignerCommand::REVOKE:
+ {
+ logger::note("Revoking: ", data);
+ std::string ca = data;
+ auto reqCA = CAs.at( ca );
+ logger::note( "CA found in recordHandler" );
+ std::shared_ptr<CRL> crl;
+ std::string date;
+ std::tie( crl, date ) = signer->revoke( reqCA, serials );
+
+ respondCommand( RecordHeader::SignerResult::REVOKED, date + crl->getSignature() );
+ }
break;
- }
- case RecordHeader::SignerCommand::GET_FULL_CRL: {
- auto ca = CAs.at( data );
- CRL c( ca->path + "/ca.crl" );
- respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() );
+ case RecordHeader::SignerCommand::GET_FULL_CRL:
+ {
+ logger::note("Requesting full CRL: ", data);
+ auto ca = CAs.at( data );
+ CRL c( ca->path + "/ca.crl" );
+ respondCommand( RecordHeader::SignerResult::FULL_CRL, c.toString() );
- if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) {
- logger::error( "ERROR: SSL shutdown failed." );
- }
+ if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) {
+ logger::error( "ERROR: SSL shutdown failed." );
+ }
- parent->reset(); // Connection ended
+ parent->reset(); // Connection ended
+ }
break;
- }
default:
throw "Unimplemented";
}
};
-DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr<Signer> signer, std::shared_ptr<BIO> bio )
- : bio( bio ), ctx( generateSSLContext( true ) ), signer( signer ), currentSession() {
+DefaultRecordHandler::DefaultRecordHandler( std::shared_ptr<Signer> signer, std::shared_ptr<BIO> bio ) :
+ bio( bio ), ctx( generateSSLContext( true ) ), signer( signer ), currentSession() {
}
void DefaultRecordHandler::reset() {
void DefaultRecordHandler::handle() {
if( !currentSession ) {
logger::note( "New session allocated." );
- currentSession = std::shared_ptr<RecordHandlerSession>( new RecordHandlerSession( this, signer, ctx, bio ) );
+ currentSession = std::make_shared<RecordHandlerSession>( this, signer, ctx, bio );
}
currentSession->work();
projects / cassiopeia.git / blobdiff