#include "remoteSigner.h"
+
+#include "log/logger.hpp"
#include "util.h"
#include <iostream>
#include <openssl/ssl.h>
#include <openssl/bn.h>
-RemoteSigner::RemoteSigner( std::shared_ptr<BIO> target, std::shared_ptr<SSL_CTX> ctx ) {
- this->target = target;
- this->ctx = ctx;
+RemoteSigner::RemoteSigner( std::shared_ptr<BIO> target, std::shared_ptr<SSL_CTX> ctx ) : target( target ), ctx( ctx ) {
}
RemoteSigner::~RemoteSigner() {
}
void RemoteSigner::send( std::shared_ptr<OpensslBIOWrapper> bio, RecordHeader& head, RecordHeader::SignerCommand cmd, std::string data ) {
- head.command = ( uint16_t ) cmd;
+ head.command = static_cast<uint16_t>( cmd );
head.command_count++;
head.totalLength = data.size();
- sendCommand( head, data, bio, log );
-
+ sendCommand( head, data, bio );
}
std::shared_ptr<SignedCertificate> RemoteSigner::sign( std::shared_ptr<TBSCertificate> cert ) {
SSL_set_connect_state( ssl.get() );
SSL_set_bio( ssl.get(), target.get(), target.get() );
BIO_set_ssl( bio.get(), ssl.get(), BIO_NOCLOSE );
- std::shared_ptr<OpensslBIOWrapper> conn( new OpensslBIOWrapper( bio ) );
+ auto conn = std::make_shared<OpensslBIOWrapper>( bio );
RecordHeader head;
head.flags = 0;
head.sessid = 13;
} else if( cert->csr_type == "SPKAC" ) {
send( conn, head, RecordHeader::SignerCommand::SET_SPKAC, cert->csr_content );
} else {
- std::cout << "Unknown csr_type: " << cert->csr_type;
- return std::shared_ptr<SignedCertificate>();
+ logger::error( "Unknown csr_type: ", cert->csr_type );
+ return nullptr;
}
send( conn, head, RecordHeader::SignerCommand::SET_SIGNATURE_TYPE, cert->md );
- send( conn, head, RecordHeader::SignerCommand::SET_PROFILE, cert->profile );
- for( auto ava : cert->AVAs ) {
+ if( !cert->ocspCA.empty() ) {
+ send( conn, head, RecordHeader::SignerCommand::SET_OCSP_TARGET_CA, cert->ocspCA );
+ } else {
+ send( conn, head, RecordHeader::SignerCommand::SET_PROFILE, cert->profile );
+ }
+
+ send( conn, head, RecordHeader::SignerCommand::SET_WISH_FROM, cert->wishFrom );
+ send( conn, head, RecordHeader::SignerCommand::SET_WISH_TO, cert->wishTo );
+
+ for( auto& ava : cert->AVAs ) {
if( ava->name.find( "," ) != std::string::npos ) {
// invalid ava
- return std::shared_ptr<SignedCertificate>();
+ return nullptr;
}
send( conn, head, RecordHeader::SignerCommand::ADD_AVA, ava->name + "," + ava->value );
}
- for( auto san : cert->SANs ) {
+ for( auto& san : cert->SANs ) {
if( san->type.find( "," ) != std::string::npos ) {
// invalid ava
- return std::shared_ptr<SignedCertificate>();
+ return nullptr;
}
send( conn, head, RecordHeader::SignerCommand::ADD_SAN, san->type + "," + san->content );
send( conn, head, RecordHeader::SignerCommand::SIGN, "" );
send( conn, head, RecordHeader::SignerCommand::LOG_SAVED, "" );
- std::shared_ptr<SignedCertificate> result = std::shared_ptr<SignedCertificate>( new SignedCertificate() );
- std::vector<char> buffer( 2048 * 4 );
+ auto result = std::make_shared<SignedCertificate>();
for( int i = 0; i < 3; i++ ) {
try {
- int length = conn->read( buffer.data(), buffer.size() );
-
- if( length <= 0 ) {
- std::cout << "Error, no response data" << std::endl;
- result = std::shared_ptr<SignedCertificate>();
- break;
- }
-
RecordHeader head;
- std::string payload = parseCommand( head, std::string( buffer.data(), length ), log );
+ std::string payload = parseCommandChunked( head, conn );
- switch( ( RecordHeader::SignerResult ) head.command ) {
+ switch( static_cast<RecordHeader::SignerResult>( head.command ) ) {
case RecordHeader::SignerResult::CERTIFICATE:
result->certificate = payload;
break;
break;
default:
- std::cout << "Invalid Message" << std::endl;
+ logger::error( "Invalid Message" );
break;
}
- } catch( const char* msg ) {
- std::cout << msg << std::endl;
+ } catch( const std::exception& msg ) {
+ logger::error( msg.what() );
return std::shared_ptr<SignedCertificate>();
}
}
if( result ) {
std::shared_ptr<BIO> bios( BIO_new( BIO_s_mem() ), BIO_free );
- const char* buf = result->certificate.data();
+ const char *buf = result->certificate.data();
unsigned int len = result->certificate.size();
while( len > 0 ) {
int dlen = BIO_write( bios.get(), buf, len );
if( dlen <= 0 ) {
- throw "Memory error.";
+ throw std::runtime_error( "Memory error." );
}
len -= dlen;
buf += dlen;
}
- std::shared_ptr<X509> pem( PEM_read_bio_X509( bios.get(), NULL, 0, NULL ) );
+ std::shared_ptr<X509> pem( PEM_read_bio_X509( bios.get(), NULL, 0, NULL ), X509_free );
if( !pem ) {
- throw "Pem was not readable";
+ throw std::runtime_error( "Pem was not readable" );
}
- std::shared_ptr<BIGNUM> ser( ASN1_INTEGER_to_BN( pem->cert_info->serialNumber, NULL ), BN_free );
- std::shared_ptr<char> serStr(
- BN_bn2hex( ser.get() ),
- []( char* p ) {
- OPENSSL_free( p );
- } ); // OPENSSL_free is a macro...
+ std::shared_ptr<BIGNUM> ser( ASN1_INTEGER_to_BN( X509_get_serialNumber( pem.get() ), NULL ), BN_free );
+ auto freeMem = []( char *p ) {
+ OPENSSL_free( p );
+ }; // OPENSSL_free is a macro...
+ std::shared_ptr<char> serStr( BN_bn2hex( ser.get() ), freeMem );
extractTimes( pem, result );
result->serial = std::string( serStr.get() );
}
+ logger::note( "Closing SSL connection" );
+
if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) { // need to close the connection twice
- std::cout << "SSL shutdown failed" << std::endl;
+ logger::warn( "SSL shutdown failed" );
}
+ logger::note( "SSL connection closed" );
+
return result;
}
SSL_set_connect_state( ssl.get() );
SSL_set_bio( ssl.get(), target.get(), target.get() );
BIO_set_ssl( bio.get(), ssl.get(), BIO_NOCLOSE );
- std::shared_ptr<OpensslBIOWrapper> conn( new OpensslBIOWrapper( bio ) );
+ auto conn = std::make_shared<OpensslBIOWrapper>( bio );
RecordHeader head;
head.flags = 0;
head.sessid = 13;
- for( std::string serial : serials ) {
+ for( auto& serial : serials ) {
send( conn, head, RecordHeader::SignerCommand::ADD_SERIAL, serial );
}
std::string payload = ca->name;
send( conn, head, RecordHeader::SignerCommand::REVOKE, payload );
- std::vector<char> buffer( 2048 * 4 );
- int length = conn->read( buffer.data(), buffer.size() );
-
- if( length <= 0 ) {
- throw "Error, no response data";
- }
-
- payload = parseCommand( head, std::string( buffer.data(), length ), log );
+ payload = parseCommandChunked( head, conn );
- std::shared_ptr<CRL> crl( new CRL( ca->path + std::string( "/ca.crl" ) ) );
+ std::string tgtName = ca->path + std::string( "/ca.crl" );
+ auto crl = std::make_shared<CRL>( tgtName );
std::string date;
- if( ( RecordHeader::SignerResult ) head.command != RecordHeader::SignerResult::REVOKED ) {
- throw "Protocol violation";
+ if( static_cast<RecordHeader::SignerResult>( head.command ) != RecordHeader::SignerResult::REVOKED ) {
+ throw std::runtime_error( "Protocol violation" );
}
- const unsigned char* buffer2 = ( const unsigned char* ) payload.data();
- const unsigned char* pos = buffer2;
- ASN1_TIME* time = d2i_ASN1_TIME( NULL, &pos, payload.size() );
+ const unsigned char *buffer2 = reinterpret_cast<const unsigned char *>( payload.data() );
+ const unsigned char *pos = buffer2;
+ ASN1_TIME *time = d2i_ASN1_TIME( NULL, &pos, payload.size() );
ASN1_TIME_free( time );
date = payload.substr( 0, pos - buffer2 );
std::string rest = payload.substr( pos - buffer2 );
- for( std::string serial : serials ) {
+ for( std::string& serial : serials ) {
crl->revoke( serial, date );
}
bool ok = crl->verify( ca );
if( ok ) {
- ( *log ) << "CRL verificated successfully" << std::endl;
- writeFile( ca->path + std::string( "/ca.crl" ), crl->toString() );
+ logger::note( "CRL verificated successfully" );
+ writeFile( tgtName, crl->toString() );
} else {
- ( *log ) << "CRL is broken" << std::endl;
+ logger::warn( "CRL is broken, trying to recover" );
send( conn, head, RecordHeader::SignerCommand::GET_FULL_CRL, ca->name );
- length = conn->read( buffer.data(), buffer.size() );
- if( length <= 0 ) {
- throw "Error, no response data";
- }
+ payload = parseCommandChunked( head, conn );
- payload = parseCommand( head, std::string( buffer.data(), length ), log );
-
- if( ( RecordHeader::SignerResult ) head.command != RecordHeader::SignerResult::FULL_CRL ) {
- throw "Protocol violation";
+ if( static_cast<RecordHeader::SignerResult>( head.command ) != RecordHeader::SignerResult::FULL_CRL ) {
+ throw std::runtime_error( "Protocol violation" );
}
- writeFile( ca->path + std::string( "/ca.crl.bak" ), payload );
- crl = std::shared_ptr<CRL>( new CRL( ca->path + std::string( "/ca.crl.bak" ) ) );
+ std::string name_bak = ca->path + std::string( "/ca.crl.bak" );
+ writeFile( name_bak, payload );
+ crl = std::make_shared<CRL>( name_bak );
if( crl->verify( ca ) ) {
- writeFile( ca->path + std::string( "/ca.crl" ), crl->toString() );
- ( *log ) << "CRL is now valid" << std::endl;
+ if( rename( name_bak.c_str(), tgtName.c_str() ) != 0 ) {
+ logger::warn( "Moving new CRL over old CRL failed" );
+ }
+
+ logger::note( "CRL is now valid again" );
} else {
- ( *log ) << "CRL is still broken... Please, help me" << std::endl;
+ logger::warn( "CRL is still broken... Please, help me" );
}
-
}
- ( *log ) << "CRL: " << std::endl << crl->toString() << std::endl;
+ logger::note( "Closing SSL connection" );
if( !SSL_shutdown( ssl.get() ) && !SSL_shutdown( ssl.get() ) ) { // need to close the connection twice
- std::cout << "SSL shutdown failed" << std::endl;
+ logger::warn( "SSL shutdown failed" );
}
- return std::pair<std::shared_ptr<CRL>, std::string>( crl, date );
+ logger::note( "SSL connection closed" );
+
+ return { crl, date };
}
void RemoteSigner::setLog( std::shared_ptr<std::ostream> target ) {
projects / cassiopeia.git / blobdiff