SVSNICK should not translate nicks to UIDs

[user/henk/code/inspircd.git] / src / modules / ssl.h

diff --git a/src/modules/ssl.h b/src/modules/ssl.h
index 3bc78cf9895b8dd5dd70d639edca715b3ceab3ee..e66e423aabd52d2c245a8e3210af91c9132394eb 100644 (file)
--- a/src/modules/ssl.h
+++ b/src/modules/ssl.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@
  * in a unified manner. These classes are attached to ssl-
  * connected local users using SSLCertExt
  */
-class ssl_cert
+class ssl_cert : public refcountbase
 {
  public:
        std::string dn;
@@ -34,6 +34,8 @@ class ssl_cert
        std::string fingerprint;
        bool trusted, invalid, unknownsigner, revoked;
 
+       ssl_cert() : trusted(false), invalid(true), unknownsigner(true), revoked(false) {}
+
        /** Get certificate distinguished name
         * @return Certificate DN
         */
@@ -104,6 +106,11 @@ class ssl_cert
                return revoked;
        }
 
+       bool IsCAVerified()
+       {
+               return trusted && !invalid && !revoked && !unknownsigner && error.empty();
+       }
+
        std::string GetMetaLine()
        {
                std::stringstream value;
@@ -118,18 +125,14 @@ class ssl_cert
        }
 };
 
-struct SSLCertificateRequest : public Request
+/** Get certificate from a socket (only useful with an SSL module) */
+struct SocketCertificateRequest : public Request
 {
-       Extensible* const item;
+       StreamSocket* const sock;
        ssl_cert* cert;
-       SSLCertificateRequest(StreamSocket* ss, Module* Me)
-               : Request(Me, ss->GetIOHook(), "GET_CERT"), item(ss), cert(NULL)
-       {
-               Send();
-       }
 
-       SSLCertificateRequest(Extensible* e, Module* Me, Module* info = ServerInstance->Modules->Find("m_sslinfo.so"))
-               : Request(Me, info, "GET_CERT"), item(e), cert(NULL)
+       SocketCertificateRequest(StreamSocket* ss, Module* Me)
+               : Request(Me, ss->GetIOHook(), "GET_SSL_CERT"), sock(ss), cert(NULL)
        {
                Send();
        }
@@ -142,15 +145,24 @@ struct SSLCertificateRequest : public Request
        }
 };
 
-struct SSLCertSubmission : public Request
+/** Get certificate from a user (requires m_sslinfo) */
+struct UserCertificateRequest : public Request
 {
-       Extensible* const item;
-       ssl_cert* const cert;
-       SSLCertSubmission(Extensible* is, Module* Me, Module* Target, ssl_cert* Cert)
-               : Request(Me, Target, "SET_CERT"), item(is), cert(Cert)
+       User* const user;
+       ssl_cert* cert;
+
+       UserCertificateRequest(User* u, Module* Me, Module* info = ServerInstance->Modules->Find("m_sslinfo.so"))
+               : Request(Me, info, "GET_USER_CERT"), user(u), cert(NULL)
        {
                Send();
        }
+
+       std::string GetFingerprint()
+       {
+               if (cert)
+                       return cert->GetFingerprint();
+               return "";
+       }
 };
 
 #endif