add elliptic curve support

Author: ibmibmibm

.ycm_extra_conf.py

@@ -0,0 +1,102 @@
+import os
+import ycm_core
+
+flags = [
+    '-Wall',
+    '-Wextra',
+    '-Wno-variadic-macros',
+    '-fexceptions',
+    '-DNDEBUG',
+    '-std=c++11',
+    '-x',
+    'c++',
+    '-isystem', 'include',
+    '-isystem', 'thirdparty/rapidjson/include',
+]
+
+
+compilation_database_folder = ''
+
+if os.path.exists(compilation_database_folder):
+    database = ycm_core.CompilationDatabase(compilation_database_folder)
+else:
+    database = None
+
+SOURCE_EXTENSIONS = ['.cpp']
+
+
+def DirectoryOfThisScript():
+    return os.path.dirname(os.path.abspath(__file__))
+
+
+def MakeRelativePathsInFlagsAbsolute(flags, working_directory):
+    if not working_directory:
+        return list(flags)
+    new_flags = []
+    make_next_absolute = False
+    path_flags = ['-isystem', '-I', '-iquote', '--sysroot=']
+    for flag in flags:
+        new_flag = flag
+
+        if make_next_absolute:
+            make_next_absolute = False
+            if not flag.startswith('/'):
+                new_flag = os.path.join(working_directory, flag)
+
+        for path_flag in path_flags:
+            if flag == path_flag:
+                make_next_absolute = True
+                break
+
+            if flag.startswith(path_flag):
+                path = flag[len(path_flag):]
+                new_flag = path_flag + os.path.join(working_directory, path)
+                break
+
+        if new_flag:
+            new_flags.append(new_flag)
+    return new_flags
+
+
+def IsHeaderFile(filename):
+    extension = os.path.splitext(filename)[1]
+    return extension in ['.h', '.hpp']
+
+
+def GetCompilationInfoForFile(filename):
+    # The compilation_commands.json file generated by CMake does not have
+    # entries for header files. So we do our best by asking the db for flags
+    # for a corresponding source file, if any. If one exists, the flags for
+    # that file should be good enough.
+    if IsHeaderFile(filename):
+        basename = os.path.splitext(filename)[0]
+        for extension in SOURCE_EXTENSIONS:
+            replacement_file = basename + extension
+            if os.path.exists(replacement_file):
+                compilation_info = database.GetCompilationInfoForFile(
+                    replacement_file)
+                if compilation_info.compiler_flags_:
+                    return compilation_info
+        return None
+    return database.GetCompilationInfoForFile(filename)
+
+
+def FlagsForFile(filename, **kwargs):
+    if database:
+        # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+        # python list, but a "list-like" StringVec object
+        compilation_info = GetCompilationInfoForFile(filename)
+        if not compilation_info:
+            return None
+
+        final_flags = MakeRelativePathsInFlagsAbsolute(
+            compilation_info.compiler_flags_,
+            compilation_info.compiler_working_dir_)
+    else:
+        relative_to = DirectoryOfThisScript()
+        final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to)
+
+    return {
+        'flags': final_flags,
+        'do_cache': True
+    }

CMakeLists.txt

@@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 2.8)
 project(libjose)
 add_subdirectory(src)
 add_subdirectory(tests)
+enable_testing()

include/libjose/jwa_ec.hpp

@@ -10,11 +10,25 @@ namespace JOSE {
 
 class JWA_EC {
 public:
+    struct Curve {
+        enum Type {
+            P256,
+            P384,
+            P521,
+        };
+    };
     JWA_EC();
     explicit JWA_EC(const std::string &);
     ~JWA_EC();
     operator bool() const {return valid_;}
     std::string to_pem() const;
+    Curve::Type crv() const;
+    std::string x() const;
+    const ustring & x_raw() const;
+    std::string y() const;
+    const ustring & y_raw() const;
+    std::string d() const;
+    const ustring & d_raw() const;
 private:
     friend class JWA;
     JWA_EC(void *);

include/libjose/jwa_oct.hpp

@@ -14,7 +14,8 @@ class JWA_OCT {
     explicit JWA_OCT(const std::string &);
     ~JWA_OCT();
     operator bool() const {return valid_;}
-    const std::string & k() const;
+    std::string k() const;
+    const ustring & k_raw() const;
 private:
     friend class JWA;
     JWA_OCT(void *);

src/jwa_ec.cpp

@@ -38,39 +38,78 @@ const boost::bimap<Key::Type, boost::bimaps::unordered_set_of<std::string>> Key:
     {Key::d, "d"},
 });
 
+struct CurveImpl {
+    typedef JWA_EC::Curve::Type Type;
+    static const boost::bimap<Type, boost::bimaps::unordered_set_of<std::string>> lookup;
+    static boost::optional<const std::string &> type2key(Type type) {
+        auto i = lookup.left.find(type);
+        if (i == lookup.left.end()) {
+            return boost::none;
+        }
+        return i->second;
+    }
+    static boost::optional<Type> key2type(const std::string &key) {
+        auto i = lookup.right.find(key);
+        if (i == lookup.right.end()) {
+            return boost::none;
+        }
+        return i->second;
+    }
+};
+
+const boost::bimap<JWA_EC::Curve::Type, boost::bimaps::unordered_set_of<std::string>> CurveImpl::lookup = make_bimap<JWA_EC::Curve::Type, boost::bimaps::unordered_set_of<std::string>>({
+    {JWA_EC::Curve::P256, "P-256"},
+    {JWA_EC::Curve::P384, "P-384"},
+    {JWA_EC::Curve::P521, "P-521"},
+});
+
 struct JWA_ECImpl {
     std::shared_ptr<rapidjson::Document> doc;
-    std::string crv, x, y, d;
+    JWA_EC::Curve::Type crv;
+    ustring x, y, d;
+    bool private_key;
     JWA_ECImpl(): doc{new rapidjson::Document} {}
     JWA_ECImpl(const std::string &json): doc{new rapidjson::Document} {
         doc->Parse(json.c_str());
     }
     JWA_ECImpl(void *_): doc{*reinterpret_cast<std::shared_ptr<rapidjson::Document>*>(_)} {}
     bool parse() {
+        std::bitset<3> required;
+        private_key = false;
         for (rapidjson::Value::ConstMemberIterator i = doc->MemberBegin(); i != doc->MemberEnd(); ++i) {
             auto key = Key::key2type(i->name.GetString());
             if (!key) {
                 continue;
             }
-                if (!i->value.IsString()) {
-                    return false;
-                }
+            if (!i->value.IsString()) {
+                return false;
+            }
             switch (*key) {
                 case Key::crv:
-                    crv = i->value.GetString();
+                    {
+                        auto type = CurveImpl::key2type(i->value.GetString());
+                        if (!type) {
+                            return false;
+                        }
+                        required.set(0);
+                        crv = *type;
+                    }
                     break;
                 case Key::x:
-                    x = i->value.GetString();
+                    required.set(1);
+                    x = urlsafe_base64_decode(i->value.GetString());
                     break;
                 case Key::y:
-                    y = i->value.GetString();
+                    required.set(2);
+                    y = urlsafe_base64_decode(i->value.GetString());
                     break;
                 case Key::d:
-                    d = i->value.GetString();
+                    private_key = true;
+                    d = urlsafe_base64_decode(i->value.GetString());
                     break;
             }
         }
-        return true;
+        return required.all();
     }
 };
 
@@ -107,7 +146,36 @@ JWA_EC::~JWA_EC() {
 }
 
 std::string JWA_EC::to_pem() const {
-    return std::string{};
+    if (impl(_)->private_key) {
+        return ECPrivateKey2PEM(crv(), x_raw(), y_raw(), d_raw());
+    } else {
+        return ECPublicKey2PEM(crv(), x_raw(), y_raw());
+    }
+}
+
+JWA_EC::Curve::Type JWA_EC::crv() const {
+    return impl(_)->crv;
+}
+
+std::string JWA_EC::x() const {
+    return urlsafe_base64_encode(x_raw());
+}
+const ustring & JWA_EC::x_raw() const {
+    return impl(_)->x;
+}
+
+std::string JWA_EC::y() const {
+    return urlsafe_base64_encode(y_raw());
+}
+const ustring & JWA_EC::y_raw() const {
+    return impl(_)->y;
+}
+
+std::string JWA_EC::d() const {
+    return urlsafe_base64_encode(d_raw());
+}
+const ustring & JWA_EC::d_raw() const {
+    return impl(_)->d;
 }
 
 } // namespace JOSE

src/jwa_oct.cpp

@@ -34,7 +34,7 @@ const boost::bimap<Key::Type, boost::bimaps::unordered_set_of<std::string>> Key:
 
 struct JWA_OCTImpl {
     std::shared_ptr<rapidjson::Document> doc;
-    std::string k;
+    ustring k;
     JWA_OCTImpl(): doc{new rapidjson::Document} {}
     JWA_OCTImpl(const std::string &json): doc{new rapidjson::Document} {
         doc->Parse(json.c_str());
@@ -46,14 +46,12 @@ struct JWA_OCTImpl {
             if (!key) {
                 continue;
             }
+            if (!i->value.IsString()) {
+                return false;
+            }
             switch (*key) {
                 case Key::k:
-                    if (!i->value.IsString()) {
-                        return false;
-                    }
-                    k = i->value.GetString();
-                    break;
-                default:
+                    k = urlsafe_base64_decode(i->value.GetString());
                     break;
             }
         }
@@ -93,7 +91,10 @@ JWA_OCT::~JWA_OCT() {
     delete impl(_);
 }
 
-const std::string & JWA_OCT::k() const {
+std::string JWA_OCT::k() const {
+    return urlsafe_base64_encode(k_raw());
+}
+const ustring & JWA_OCT::k_raw() const {
     return impl(_)->k;
 }