Add the time tag on the server the message originates from.

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

diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 9cc504128daae20a0daee6b4ea0c2880d8ccaa67..6fc2379ff42c00bf13461af81340f95832741719 100644 (file)
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -112,9 +112,21 @@ class ssl_cert : public refcountbase
                return revoked;
        }
 
+       /** Get certificate usability
+       * @return True if the certificate is not expired nor revoked
+       */
+       bool IsUsable()
+       {
+               return !invalid && !revoked && error.empty();
+       }
+
+       /** Get CA trust status
+       * @return True if the certificate is issued by a CA
+       * and valid.
+       */
        bool IsCAVerified()
        {
-               return trusted && !invalid && !revoked && !unknownsigner && error.empty();
+               return IsUsable() && trusted && !unknownsigner;
        }
 
        std::string GetMetaLine()
@@ -181,7 +193,7 @@ class SSLIOHook : public IOHook
         * Get the certificate sent by this peer
         * @return The SSL certificate sent by the peer, NULL if no cert was sent
         */
-       ssl_cert* GetCertificate() const
+       virtual ssl_cert* GetCertificate() const
        {
                return certificate;
        }
@@ -191,10 +203,10 @@ class SSLIOHook : public IOHook
         * @return The fingerprint of the SSL client certificate sent by the peer,
         * empty if no cert was sent
         */
-       std::string GetFingerprint() const
+       virtual std::string GetFingerprint() const
        {
                ssl_cert* cert = GetCertificate();
-               if (cert)
+               if (cert && cert->IsUsable())
                        return cert->GetFingerprint();
                return "";
        }
@@ -204,6 +216,13 @@ class SSLIOHook : public IOHook
         * @param out String where the ciphersuite string will be appended to
         */
        virtual void GetCiphersuite(std::string& out) const = 0;
+
+
+       /** Retrieves the name of the SSL connection which is sent via SNI.
+        * @param out String that the server name will be appended to.
+        * returns True if the server name was retrieved; otherwise, false.
+        */
+       virtual bool GetServerName(std::string& out) const = 0;
 };
 
 /** Helper functions for obtaining SSL client certificates and key fingerprints
@@ -256,6 +275,12 @@ class UserCertificateAPIBase : public DataProvider
         */
        virtual ssl_cert* GetCertificate(User* user) = 0;
 
+       /** Set the SSL certificate of a user.
+        * @param user The user whose certificate to set.
+        * @param cert The SSL certificate to set for the user.
+        */
+       virtual void SetCertificate(User* user, ssl_cert* cert) = 0;
+
        /** Get the key fingerprint from a user's certificate
         * @param user The user whose key fingerprint to get, user may be remote
         * @return The key fingerprint from the user's SSL certificate or an empty string