修复：“reference undefined to xxx”等错误；

Author: IteratorGIT

devapi/abe/abe_crypto.cc

@@ -13,6 +13,7 @@
 #include "mysqlx/abe/base64.h"
 
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
 namespace abe{
 
 bool abe_crypto::encrypt(std::string pt, std::string policy, std::string &ct){
@@ -27,7 +28,7 @@ bool abe_crypto::encrypt(std::string pt, std::string policy, std::string &ct){
   return true;
 }
 
-bool abe_crypto::decrypt(std::string ct, std::string &pt){
+bool abe_crypto::decrypt(const std::string ct, std::string &pt){
 
   if(!check_abe_key()){
     return false;
@@ -321,4 +322,6 @@ bool abe_crypto::rsa_decrypt(const std::string ct, std::string &pt){
 }
 
 }//namespace mysqlx::abe
+
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx

devapi/abe/base64.cc

@@ -3,6 +3,7 @@
 #include <iostream>
 
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
 namespace abe{
 namespace base64_utils {
 
@@ -110,4 +111,6 @@ unsigned b64_dec_len(unsigned srclen)
 
 }
 }//namespace mysqlx::abe
+
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx

devapi/abe/rewrite.cc

@@ -15,6 +15,7 @@
 * 解密函数格式：abe_dec(<field name>)
 */
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
 namespace abe{
 
 CommandType simple_parse(const std::string sql){
@@ -120,4 +121,5 @@ std::vector<std::string> rewrite_plan::get_field_name_list() const {
 }
 
 }//namespace mysqlx::abe
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx

devapi/abe_extern.cc

@@ -7,6 +7,8 @@
 
 
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
+
 using rewrite_plan = mysqlx::abe::rewrite_plan;
 using abe_crypto = mysqlx::abe::abe_crypto;
 
@@ -39,9 +41,9 @@ RowResult abe_query::execute(){
 std::string abe_query::recover(const std::string &ct){
     std::string pt;
     if(!crypto->decrypt(ct, pt)){
-        return pt;
+        return "";
     }
-    return "";
+    return pt;
 }
 
 
@@ -87,7 +89,7 @@ std::string abe_env::get_current_user(){
     if(row_num != 1 || field_num != 1)  return "";
 
     auto it = res.begin();
-    auto str = (*it).get(1).get<string>();
+    auto str = (*it).get(0).get<string>();
     std::string namehost(str);
     return namehost;
 }
@@ -101,7 +103,7 @@ std::string abe_env::get_current_user_abe_attribute(){
     if(row_num != 1 || field_num != 1)  return "";
 
     auto it = res.begin();
-    auto str = (*it).get(1).get<string>();
+    auto str = (*it).get(0).get<string>();
     std::string att(str);
     return att;
 }
@@ -157,4 +159,5 @@ bool abe_decrypt(abe_crypto &abe, std::string ct, std::string &pt){
     return true;
 }
 
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx

include/mysqlx/abe/abe_crypto.h

@@ -7,8 +7,10 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include "openssl/crypto.h"
+#include "../common/api.h"
 
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
 namespace abe{
 
 #define ABE_ERROR(msg) std::cerr << "error: " << (msg) << std::endl;
@@ -24,7 +26,7 @@ struct abe_user{
   std::string user_attr;
 };
 
-class abe_crypto{
+class PUBLIC_API abe_crypto{
 public:
 
     abe_crypto(){}
@@ -39,7 +41,7 @@ class abe_crypto{
     bool check_abe_key();   //true: abe_key已存在
 
     bool encrypt(std::string pt, std::string policy, std::string &ct);
-    bool decrypt(std::string ct, std::string &pt);
+    bool decrypt(const std::string ct, std::string &pt);
 
     bool import_db_cert(std::string db_cert_path);
     bool import_kms_cert(std::string kms_cert_path);
@@ -61,6 +63,7 @@ class abe_crypto{
 };
 
 }//namespace mysqlx::abe
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx
 
 #endif

include/mysqlx/abe/base64.h

@@ -1,6 +1,9 @@
 #ifndef SQL_ABE_BASE64_H
 #define SQL_ABE_BASE64_H
+#include "../common/api.h"
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
+
 namespace abe{
 namespace base64_utils {
     static const char _base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -143,5 +146,7 @@ namespace base64_utils {
 }
 
 }//namespace mysqlx::abe
+
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx
 #endif // SEC_ABE_UTILS_H

include/mysqlx/abe/rewrite.h

@@ -8,9 +8,12 @@
 #include <unordered_map>
 #include <regex>
 #include "abe_crypto.h"
+#include "../common/api.h"
 
 
 namespace mysqlx{
+MYSQLX_ABI_BEGIN(2,0)
+
 namespace abe{
 enum CommandType{
     BEGIN,
@@ -142,5 +145,6 @@ class rewrite_plan{
 };
 
 }//namespace mysqlx::abe
+MYSQLX_ABI_END(2,0)
 }//namespace mysqlx
 #endif

include/mysqlx/abe_extern.h

@@ -7,17 +7,18 @@
 #include "xdevapi.h"
 // #include "devapi/detail/result.h"
 namespace mysqlx {
+MYSQLX_ABI_BEGIN(2,0)
 
 struct abe_parameters{
-    string rsa_sk_path; //rsa私钥路径,用于解密
-    string db_cert_path;  //db证书，用于验签
-    string kms_cert_path;   //kms证书，用于验签
+    std::string rsa_sk_path; //rsa私钥路径,用于解密
+    std::string db_cert_path;  //db证书，用于验签
+    std::string kms_cert_path;   //kms证书，用于验签
 
-    string abe_key_path;    //abe密钥路径
-    string abe_pp_path;     //abe公共参数路径，也可称mpk
+    std::string abe_key_path;    //abe密钥路径
+    std::string abe_pp_path;     //abe公共参数路径，也可称mpk
 };
 
-class abe_query : public abe::rewrite_plan{
+class PUBLIC_API abe_query : public abe::rewrite_plan{
 public:
     abe_query(Session * sess, abe::abe_crypto * abe, std::string sql): rewrite_plan(sql){
         this->sess = sess;
@@ -38,7 +39,7 @@ class abe_query : public abe::rewrite_plan{
     Session * sess;
 };
 
-class abe_env{
+class PUBLIC_API abe_env{
 public:
     abe_env(Session &sess){
         this->sess = &sess;
@@ -74,6 +75,8 @@ class abe_env{
 
 bool abe_encrypt(abe::abe_crypto &abe, std::string pt, std::string policy, std::string &ct );
 bool abe_decrypt(abe::abe_crypto &abe, std::string ct, std::string &pt);
+
+MYSQLX_ABI_END(2,0)
 }
 // const std::string abe_rewrite(const std::string &query, const abe_crypto &abe);
 #endif //ABE_EXTERN_H

include/mysqlx/common/api.h

@@ -92,6 +92,10 @@ MYSQLX_ABI_BEGIN(2,0)
   namespace common {
   }
 
+  namespace abe {
+    
+  }
+
 MYSQLX_ABI_END(2,0)
 
 /*