X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fapps%2Fclient.cpp;h=1793de0027177b6a79e84598d88e92b4a24f02fa;hb=56358cbe81dd0d11267a06133ce227c2c53f10f7;hp=8ed2ca45eacbdd8fe9f1cd4a90f4d7d2c1047894;hpb=e914bd7cac4990c3596bc21956943221a8e84d9b;p=cassiopeia.git

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index 8ed2ca4..1793de0 100644
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -4,15 +4,16 @@
 #include <iostream>
 #include <fstream>
 #include <streambuf>
+#include <unordered_map>
 
-#include "database.h"
-#include "mysql.h"
-#include "simpleOpensslSigner.h"
+#include "db/database.h"
+#include "db/mysql.h"
+#include "crypto/simpleOpensslSigner.h"
+#include "crypto/remoteSigner.h"
+#include "crypto/sslUtil.h"
 #include "util.h"
-#include "bios.h"
-#include "slipBio.h"
-#include "remoteSigner.h"
-#include "sslUtil.h"
+#include "io/bios.h"
+#include "io/slipBio.h"
 #include "config.h"
 
 #ifdef NO_DAEMON
@@ -22,22 +23,9 @@
 #endif
 
 extern std::string keyDir;
-extern std::vector<Profile> profiles;
 extern std::string sqlHost, sqlUser, sqlPass, sqlDB;
 extern std::string serialPath;
-
-std::string writeBackFile( uint32_t serial, std::string cert ) {
-    std::string filename = "keys";
-    mkdir( filename.c_str(), 0755 );
-    filename += "/crt";
-    mkdir( filename.c_str(), 0755 );
-    filename += "/" + std::to_string( serial / 1000 );
-    mkdir( filename.c_str(), 0755 );
-    filename += "/" + std::to_string( serial ) + ".crt";
-    writeFile( filename, cert );
-    std::cout << "wrote to " << filename << std::endl;
-    return filename;
-}
+extern std::unordered_map<std::string, std::shared_ptr<CAConfig>> CAs;
 
 int main( int argc, const char* argv[] ) {
     ( void ) argc;
@@ -81,44 +69,95 @@ int main( int argc, const char* argv[] ) {
             continue;
         }
 
+        std::ofstream* logP = new std::ofstream( std::string( "logs/" ) + job->id + std::string( "_" ) + job->warning + std::string( ".log" ) );
+        std::shared_ptr<std::ofstream> logPtr(
+            logP,
+            []( std::ofstream * ptr ) {
+                ( *ptr ).close();
+                delete ptr;
+            } );
+        std::ofstream& log = *logP;
+
+        sign->setLog( logPtr );
+        log << "TASK ID: " << job->id << std::endl;
+        log << "TRY: " << job->warning << std::endl;
+        log << "TARGET: " << job->target << std::endl;
+        log << "TASK: " << job->task << std::endl << std::endl;
+
         if( job->task == "sign" ) {
             try {
                 std::shared_ptr<TBSCertificate> cert = jp->fetchTBSCert( job );
+                log << "INFO: message digest: " << cert->md << std::endl;
+                log << "INFO: profile id: " << cert->profile << std::endl;
+
+                for( auto& SAN : cert->SANs ) {
+                    log << "INFO: SAN " << SAN->type << ": " << SAN->content;
+                }
+
+                for( auto& AVA : cert->AVAs ) {
+                    log << "INFO: AVA " << AVA->name << ": " << AVA->value;
+                }
 
                 if( !cert ) {
                     std::cout << "wasn't able to load CSR" << std::endl;
-                    return 2;
+                    jp->failJob( job );
+                    continue;
                 }
 
-                std::cout << "Found a CSR at '" << cert->csr << "' signing" << std::endl;
-                cert->csr_content = readFile( cert->csr );
-                std::cout << cert->csr_content << " content " << std::endl;
+                log << "FINE: Found the CSR at '" << cert->csr << "'" << std::endl;
+                cert->csr_content = readFile( keyDir + "/../" + cert->csr );
+                log << "FINE: CSR is " << std::endl << cert->csr_content << std::endl;
 
                 std::shared_ptr<SignedCertificate> res = sign->sign( cert );
 
                 if( !res ) {
-                    std::cout << "Error no cert came back." << std::endl;
+                    log << "ERROR: The signer failed. There was no certificate." << std::endl;
+                    jp->failJob( job );
                     continue;
                 }
 
-                std::cout << "did it!" << res->certificate << std::endl;
-                std::string fn = writeBackFile( atoi( job->target.c_str() ), res->certificate );
+                log << "FINE: CERTIFICATE LOG: " << res->log << std::endl;
+                log << "FINE: CERTIFICATE:" << std::endl << res->certificate << std::endl;
+                std::string fn = writeBackFile( job->target.c_str(), res->certificate, keyDir );
                 res->crt_name = fn;
                 jp->writeBack( job, res );
-                std::cout << "wrote back" << std::endl;
+                log << "FINE: signing done." << std::endl;
+
+                if( DAEMON ) {
+                    jp->finishJob( job );
+                }
+
+                continue;
             } catch( const char* c ) {
-                std::cerr << "ERROR: " << c << std::endl;
-                return 2;
+                log << "ERROR: " << c << std::endl;
             } catch( std::string c ) {
-                std::cerr << "ERROR: " << c << std::endl;
-                return 2;
+                log << "ERROR: " << c << std::endl;
             }
-        } else {
-            std::cout << "Unknown job type" << job->task << std::endl;
-        }
 
-        if( DAEMON && !jp->finishJob( job ) ) {
-            return 1;
+            try {
+                jp->failJob( job );
+            } catch( const char* c ) {
+                log << "ERROR: " << c << std::endl;
+            } catch( std::string c ) {
+                log << "ERROR: " << c << std::endl;
+            }
+        } else if( job->task == "revoke" ) {
+            std::cout << "Revoking!" << std::endl;
+
+            for( auto& x : CAs ) {
+                std::cout << " [" << x.first << ']' << std::endl;
+            }
+
+            try {
+                auto data = jp->getRevocationInfo( job );
+                sign->revoke( CAs.at( data.second ), data.first );
+                jp->finishJob( job );
+            } catch( const char* c ) {
+                std::cout << "Exception: " << c << std::endl;
+            }
+        } else {
+            log << "Unknown job type" << job->task << std::endl;
+            jp->failJob( job );
         }
 
         if( !DAEMON || once ) {