int err = mysql_real_query( this->conn.get(), query.c_str(), query.size() );
if( err ) {
- throw( std::string( "MySQL error: " ) + mysql_error( this->conn.get() ) ).c_str();
+ throw std::string( "MySQL error: " ) + mysql_error( this->conn.get() );
}
auto c = conn;
return job;
}
-std::string MySQLJobProvider::escape_string( const std::string & target ) {
+std::string MySQLJobProvider::escape_string( const std::string& target ) {
if( !conn ) {
throw "Not connected!";
}
std::shared_ptr<TBSCertificate> MySQLJobProvider::fetchTBSCert( std::shared_ptr<Job> job ) {
std::shared_ptr<TBSCertificate> cert = std::shared_ptr<TBSCertificate>( new TBSCertificate() );
- std::string q = "SELECT CN, subject, md, profile, csr_name, csr_type FROM certs WHERE id='" + this->escape_string( job->target ) + "'";
+ std::string q = "SELECT md, profile, csr_name, csr_type FROM certs WHERE id='" + this->escape_string( job->target ) + "'";
int err = 0;
return std::shared_ptr<TBSCertificate>();
}
- cert->CN = std::string( row[0], row[0] + l[0] );
- cert->subj = std::string( row[1], row[1] + l[1] );
- cert->md = std::string( row[2], row[2] + l[2] );
- cert->profile = std::string( row[3], row[3] + l[3] );
- cert->csr = std::string( row[4], row[4] + l[4] );
- cert->csr_type = std::string( row[5], row[5] + l[5] );
+ cert->md = std::string( row[0], row[0] + l[0] );
+ cert->profile = std::string( row[1], row[1] + l[1] );
+ cert->csr = std::string( row[2], row[2] + l[2] );
+ cert->csr_type = std::string( row[3], row[3] + l[3] );
cert->SANs = std::vector<std::shared_ptr<SAN>>();
return std::shared_ptr<TBSCertificate>();
}
+ std::cout << "Fetching SANs" << std::endl;
+
while( ( row = mysql_fetch_row( res.get() ) ) ) {
unsigned long* l = mysql_fetch_lengths( res.get() );
cert->SANs.push_back( nSAN );
}
+ q = "SELECT name, value FROM certAvas WHERE certid='" + this->escape_string( job->target ) + "'";
+ std::tie( err, res ) = query( q );
+
+ if( err ) {
+ std::cout << mysql_error( this->conn.get() );
+ return std::shared_ptr<TBSCertificate>();
+
+ }
+
+ while( ( row = mysql_fetch_row( res.get() ) ) ) {
+ unsigned long* l = mysql_fetch_lengths( res.get() );
+
+ if( !l ) {
+ return std::shared_ptr<TBSCertificate>();
+ }
+
+ std::shared_ptr<AVA> nAVA = std::shared_ptr<AVA>( new AVA() );
+ nAVA->name = std::string( row[0], row[0] + l[0] );
+ nAVA->value = std::string( row[1], row[1] + l[1] );
+ cert->AVAs.push_back( nAVA );
+ }
+
return cert;
}
+
+void MySQLJobProvider::writeBack( std::shared_ptr<Job> job, std::shared_ptr<SignedCertificate> res ) {
+ if( !conn ) {
+ throw "Error while writing back";
+ }
+
+ std::string q = "UPDATE certs SET crt_name='" + this->escape_string( res->crt_name ) + "', serial='" + this->escape_string( res->serial ) + "', created=NOW() WHERE id='" + this->escape_string( job->target ) + "' LIMIT 1";
+
+ // TODO write more thingies back
+
+ if( query( q ).first ) {
+ throw "Error while writing back";
+ }
+}