zeroc-ice 3.7.10 → 3.8.0

data/ext/ice/cpp/src/IceSSL/PluginI.h

@@ -1,67 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICESSL_PLUGIN_I_H
-#define ICESSL_PLUGIN_I_H
-
-#include <IceSSL/Plugin.h>
-#include <IceSSL/SSLEngineF.h>
-#include <IceSSL/ConnectionInfo.h>
-#include <Ice/CommunicatorF.h>
-
-namespace IceSSL
-{
-
-class ExtendedConnectionInfo : public ConnectionInfo
-{
-public:
-
-    TrustError errorCode;
-    std::string host;
-};
-ICE_DEFINE_PTR(ExtendedConnectionInfoPtr, ExtendedConnectionInfo);
-
-// TODO: This class provides new certificate virtual methods that canot be added directly to the certificate class
-// without breaking binary compatibility. The class can be removed once the relevant methods can be marked as virtual in
-// the certificate class in the next major release (3.8.x).
-class ICESSL_API CertificateExtendedInfo
-{
-public:
-
-    virtual unsigned int getKeyUsage() const = 0;
-    virtual unsigned int getExtendedKeyUsage() const = 0;
-};
-
-class ICESSL_API PluginI : public virtual IceSSL::Plugin
-{
-public:
-
-    PluginI(const Ice::CommunicatorPtr&, const IceSSL::SSLEnginePtr&);
-    //
-    // From Ice::Plugin.
-    //
-    virtual void initialize();
-    virtual void destroy();
-
-    //
-    // From IceSSL::Plugin.
-    //
-#ifdef ICE_CPP11_MAPPING
-    virtual void setCertificateVerifier(std::function<bool(const std::shared_ptr<ConnectionInfo>&)>);
-    virtual void setPasswordPrompt(std::function<std::string()>);
-#else
-    virtual void setCertificateVerifier(const CertificateVerifierPtr&);
-    virtual void setPasswordPrompt(const PasswordPromptPtr&);
-#endif
-
-    virtual CertificatePtr load(const std::string&) const = 0;
-    virtual CertificatePtr decode(const std::string&) const = 0;
-protected:
-
-    SSLEnginePtr _engine;
-};
-
-}
-
-#endif

data/ext/ice/cpp/src/IceSSL/RFC2253.cpp

@@ -1,490 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/StringUtil.h>
-
-#include <IceSSL/Plugin.h>
-#include <IceSSL/RFC2253.h>
-#include <Ice/Object.h>
-
-using namespace std;
-using namespace IceSSL;
-
-namespace
-{
-
-//
-// See RFC 2253 and RFC 1779.
-//
-
-string special = ",=+<>#;";
-string hexvalid = "0123456789abcdefABCDEF";
-
-}
-
-static char unescapeHex(const string&, size_t);
-static pair<string,string> parseNameComponent(const string&, size_t&);
-static pair<string,string> parseAttributeTypeAndValue(const string&, size_t&);
-static string parseAttributeType(const string&, size_t&);
-static string parseAttributeValue(const string&, size_t&);
-static string parsePair(const string&, size_t&);
-static string parseHexPair(const string&, size_t&, bool);
-static void eatWhite(const string&, size_t&);
-
-RFC2253::RDNEntrySeq
-RFC2253::parse(const string& data)
-{
-    RDNEntrySeq results;
-    RDNEntry current;
-    current.negate = false;
-    size_t pos = 0;
-    while(pos < data.size())
-    {
-        eatWhite(data, pos);
-        if(pos < data.size() && data[pos] == '!')
-        {
-            if(!current.rdn.empty())
-            {
-                throw ParseException(__FILE__, __LINE__, "negation symbol '!' must appear at start of list");
-            }
-            ++pos;
-            current.negate = true;
-        }
-        current.rdn.push_back(parseNameComponent(data, pos));
-        eatWhite(data, pos);
-        if(pos < data.size() && data[pos] == ',')
-        {
-            ++pos;
-        }
-        else if(pos < data.size() && data[pos] == ';')
-        {
-            ++pos;
-            results.push_back(current);
-            current.rdn.clear();
-            current.negate = false;
-        }
-        else if(pos < data.size())
-        {
-            throw ParseException(__FILE__, __LINE__, "expected ',' or ';' at `" + data.substr(pos) + "'");
-        }
-    }
-    if(!current.rdn.empty())
-    {
-        results.push_back(current);
-    }
-
-    return results;
-}
-
-RFC2253::RDNSeq
-RFC2253::parseStrict(const string& data)
-{
-    RDNSeq results;
-    size_t pos = 0;
-    while(pos < data.size())
-    {
-        results.push_back(parseNameComponent(data, pos));
-        eatWhite(data, pos);
-        if(pos < data.size() && (data[pos] == ',' || data[pos] == ';'))
-        {
-            ++pos;
-        }
-        else if(pos < data.size())
-        {
-            throw ParseException(__FILE__, __LINE__, "expected ',' or ';' at `" + data.substr(pos) + "'");
-        }
-    }
-    return results;
-}
-
-string
-RFC2253::unescape(const string& data)
-{
-    if(data.size() == 0)
-    {
-        return data;
-    }
-
-    if(data[0] == '"')
-    {
-        if(data[data.size() - 1] != '"')
-        {
-            throw ParseException(__FILE__, __LINE__, "unescape: missing \"");
-        }
-
-        //
-        // Return the string without quotes.
-        //
-        return data.substr(1, data.size() - 2);
-    }
-
-    //
-    // Unescape the entire string.
-    //
-    string result;
-    if(data[0] == '#')
-    {
-        size_t pos = 1;
-        while(pos < data.size())
-        {
-            result += unescapeHex(data, pos);
-            pos += 2;
-        }
-    }
-    else
-    {
-        size_t pos = 0;
-        while(pos < data.size())
-        {
-            if(data[pos] != '\\')
-            {
-                result += data[pos];
-                ++pos;
-            }
-            else
-            {
-                ++pos;
-                if(pos >= data.size())
-                {
-                    throw ParseException(__FILE__, __LINE__, "unescape: invalid escape sequence");
-                }
-                if(special.find(data[pos]) != string::npos || data[pos] != '\\' || data[pos] != '"')
-                {
-                    result += data[pos];
-                    ++pos;
-                }
-                else
-                {
-                    result += unescapeHex(data, pos);
-                    pos += 2;
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
-static int
-hexToInt(char v)
-{
-    if(v >= '0' && v <= '9')
-    {
-        return v - '0';
-    }
-    if(v >= 'a' && v <= 'f')
-    {
-        return 10 + (v - 'a');
-    }
-    if(v >= 'A' && v <= 'F')
-    {
-        return 10 + (v - 'A');
-    }
-    throw ParseException(__FILE__, __LINE__, "unescape: invalid hex pair");
-}
-
-static char
-unescapeHex(const string& data, size_t pos)
-{
-    assert(pos < data.size());
-    if(pos + 2 >= data.size())
-    {
-        throw ParseException(__FILE__, __LINE__, "unescape: invalid hex pair");
-    }
-    return static_cast<char>(hexToInt(data[pos]) * 16 + hexToInt(data[pos + 1]));
-}
-
-static pair<string,string>
-parseNameComponent(const string& data, size_t& pos)
-{
-    pair<string, string> final = parseAttributeTypeAndValue(data, pos);
-    while(pos < data.size())
-    {
-        eatWhite(data, pos);
-        if(pos < data.size() && data[pos] == '+')
-        {
-            ++pos;
-        }
-        else
-        {
-            break;
-        }
-        pair<string, string> p = parseAttributeTypeAndValue(data, pos);
-        final.second += "+";
-        final.second += p.first;
-        final.second += '=';
-        final.second += p.second;
-    }
-    return final;
-}
-
-static pair<string,string>
-parseAttributeTypeAndValue(const string& data, size_t& pos)
-{
-    pair<string, string> p;
-    p.first = parseAttributeType(data, pos);
-    eatWhite(data, pos);
-
-    if(pos >= data.size())
-    {
-        throw ParseException(__FILE__, __LINE__, "invalid attribute type/value pair (unexpected end of data)");
-    }
-    if(data[pos] != '=')
-    {
-        throw ParseException(__FILE__, __LINE__, "invalid attribute type/value pair (missing =)");
-    }
-    ++pos;
-    p.second = parseAttributeValue(data, pos);
-    return p;
-}
-
-static string
-parseAttributeType(const string& data, size_t& pos)
-{
-    eatWhite(data, pos);
-    if(pos >= data.size())
-    {
-        throw ParseException(__FILE__, __LINE__, "invalid attribute type (expected end of data)");
-    }
-
-    string result;
-
-    //
-    // RFC 1779.
-    // <key> ::= 1*( <keychar> ) | "OID." <oid> | "oid." <oid>
-    // <oid> ::= <digitstring> | <digitstring> "." <oid>
-    // RFC 2253:
-    // attributeType = (ALPHA 1*keychar) | oid
-    // keychar    = ALPHA | DIGIT | "-"
-    // oid        = 1*DIGIT *("." 1*DIGIT)
-    //
-    // In section 4 of RFC 2253 the document says:
-    // Implementations MUST allow an oid in the attribute type to be
-    // prefixed by one of the character strings "oid." or "OID.".
-    //
-    // Here we must also check for "oid." and "OID." before parsing
-    // according to the ALPHA KEYCHAR* rule.
-    //
-    // First the OID case.
-    //
-    if(IceUtilInternal::isDigit(data[pos]) ||
-       (data.size() - pos >= 4 && (data.substr(pos, 4) == "oid." || data.substr(pos, 4) == "OID.")))
-    {
-        if(!IceUtilInternal::isDigit(data[pos]))
-        {
-            result += data.substr(pos, 4);
-            pos += 4;
-        }
-
-        while(true)
-        {
-            // 1*DIGIT
-            while(pos < data.size() && IceUtilInternal::isDigit(data[pos]))
-            {
-                result += data[pos];
-                ++pos;
-            }
-            // "." 1*DIGIT
-            if(pos < data.size() && data[pos] == '.')
-            {
-                result += data[pos];
-                ++pos;
-                // 1*DIGIT must follow "."
-                if(pos < data.size() && !IceUtilInternal::isDigit(data[pos]))
-                {
-                    throw ParseException(__FILE__, __LINE__, "invalid attribute type (expected end of data)");
-                }
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-    else if(IceUtilInternal::isAlpha(data[pos]))
-    {
-        //
-        // The grammar is wrong in this case. It should be ALPHA
-        // KEYCHAR* otherwise it will not accept "O" as a valid
-        // attribute type.
-        //
-        result += data[pos];
-        ++pos;
-        // 1* KEYCHAR
-        while(pos < data.size() &&
-              (IceUtilInternal::isAlpha(data[pos]) || IceUtilInternal::isDigit(data[pos]) || data[pos] == '-'))
-        {
-            result += data[pos];
-            ++pos;
-        }
-    }
-    else
-    {
-        throw ParseException(__FILE__, __LINE__, "invalid attribute type");
-    }
-    return result;
-}
-
-static string
-parseAttributeValue(const string& data, size_t& pos)
-{
-    eatWhite(data, pos);
-    string result;
-    if(pos >= data.size())
-    {
-        return result;
-    }
-
-    //
-    // RFC 2253
-    // # hexstring
-    //
-    if(data[pos] == '#')
-    {
-        result += data[pos];
-        ++pos;
-        while(true)
-        {
-            string h = parseHexPair(data, pos, true);
-            if(h.size() == 0)
-            {
-                break;
-            }
-            result += h;
-        }
-    }
-    //
-    // RFC 2253
-    // QUOTATION *( quotechar | pair ) QUOTATION ; only from v2
-    // quotechar     = <any character except "\" or QUOTATION >
-    //
-    else if(data[pos] == '"')
-    {
-        result += data[pos];
-        ++pos;
-        while(true)
-        {
-            if(pos >= data.size())
-            {
-                throw ParseException(__FILE__, __LINE__, "invalid attribute value (unexpected end of data)");
-            }
-            // final terminating "
-            if(data[pos] == '"')
-            {
-                result += data[pos];
-                ++pos;
-                break;
-            }
-            // any character except '\'
-            else if(data[pos] != '\\')
-            {
-                result += data[pos];
-                ++pos;
-            }
-            // pair '\'
-            else
-            {
-                result += parsePair(data, pos);
-            }
-        }
-    }
-    //
-    // RFC 2253
-    // * (stringchar | pair)
-    // stringchar = <any character except one of special, "\" or QUOTATION >
-    //
-    else
-    {
-        while(pos < data.size())
-        {
-            if(data[pos] == '\\')
-            {
-                result += parsePair(data, pos);
-            }
-            else if(special.find(data[pos]) == string::npos && data[pos] != '"')
-            {
-                result += data[pos];
-                ++pos;
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-    return result;
-}
-
-//
-// RFC2253:
-// pair       = "\" ( special | "\" | QUOTATION | hexpair )
-//
-static string
-parsePair(const string& data, size_t& pos)
-{
-    string result;
-
-    assert(data[pos] == '\\');
-    result += data[pos];
-    ++pos;
-
-    if(pos >= data.size())
-    {
-        throw ParseException(__FILE__, __LINE__, "invalid escape format (unexpected end of data)");
-    }
-
-    if(special.find(data[pos]) != string::npos || data[pos] != '\\' || data[pos] != '"')
-    {
-        result += data[pos];
-        ++pos;
-        return result;
-    }
-    return parseHexPair(data, pos, false);
-}
-
-//
-// RFC 2253
-// hexpair    = hexchar hexchar
-//
-static string
-parseHexPair(const string& data, size_t& pos, bool allowEmpty)
-{
-    string result;
-    if(pos < data.size() && hexvalid.find(data[pos]) != string::npos)
-    {
-        result += data[pos];
-        ++pos;
-    }
-    if(pos < data.size() && hexvalid.find(data[pos]) != string::npos)
-    {
-        result += data[pos];
-        ++pos;
-    }
-    if(result.size() != 2)
-    {
-        if(allowEmpty && result.size() == 0)
-        {
-            return result;
-        }
-        throw ParseException(__FILE__, __LINE__, "invalid hex format");
-    }
-    return result;
-}
-
-//
-// RFC 2253:
-//
-// Implementations MUST allow for space (' ' ASCII 32) characters to be
-// present between name-component and ',', between attributeTypeAndValue
-// and '+', between attributeType and '=', and between '=' and
-// attributeValue.  These space characters are ignored when parsing.
-//
-static void
-eatWhite(const string& data, size_t& pos)
-{
-    while(pos < data.size() && data[pos] == ' ')
-    {
-        ++pos;
-    }
-}

data/ext/ice/cpp/src/IceSSL/RFC2253.h

@@ -1,62 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICESSL_RFC_2253_H
-#define ICESSL_RFC_2253_H
-
-#include <IceUtil/Config.h>
-#include <list>
-
-//
-// The methods in the IceSSL::RFC2253 namespace implement a parser
-// for relative distinguished name (RDN) pairs using the parsing
-// rules outlined in sections 3 and 4 of RFC 2253.
-//
-// Note that this parser does not unescape the elements of the RDNs.
-// For example, parsing the following RDN
-//
-// O=Sue\, Grabit and Runn
-//
-// results in the pair ("O","Sue\, Grabit and Runn") and not
-// ("O","Sue, Grabit and Runn").
-//
-namespace IceSSL
-{
-namespace RFC2253
-{
-
-typedef std::list< std::pair<std::string, std::string> > RDNSeq;
-
-struct ICESSL_API RDNEntry
-{
-    RDNSeq rdn;
-    bool negate;
-};
-typedef std::list<RDNEntry> RDNEntrySeq;
-
-//
-// This function separates DNs with the ';' character. A list of RDN
-// pairs may optionally be prefixed with '!' to indicate a negation.
-// The function returns a list of RDNEntry structures. Any failure in
-// parsing results in a ParseException being thrown.
-//
-ICESSL_API RDNEntrySeq parse(const std::string&);
-
-//
-// RDNs are separated with ',' and ';'.
-//
-// This function returns a list of RDN pairs. Any failure in parsing
-// results in a ParseException being thrown.
-//
-ICESSL_API RDNSeq parseStrict(const std::string&);
-
-//
-// Unescape the string.
-//
-ICESSL_API std::string unescape(const std::string&);
-
-}
-}
-
-#endif