Skip to content

S
sgxwallet
Unverified Commit 0ec388d2 authored by Stan Kladko's avatar Stan Kladko Committed by GitHub
Browse files
Options

Merge pull request #41 from skalenetwork/SKALE-2077-cleanup-sgx 

SKALE-2077 Fixed Naming
parents f20e6a97 0eefcfa3
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
CSRManagerServer.cpp
View file @ 0ec388d2
...@@ -23,8 +23,8 @@ CSRManagerServer::CSRManagerServer(AbstractServerConnector &connector, ...@@ -23,8 +23,8 @@ CSRManagerServer::CSRManagerServer(AbstractServerConnector &connector,
serverVersion_t type):abstractCSRManagerServer(connector, type){} serverVersion_t type):abstractCSRManagerServer(connector, type){}
Json::Value GetUnsignedCSRsImpl(){ Json::Value getUnsignedCSRsImpl(){
spdlog::info("Enter GetUnsignedCSRsImpl"); spdlog::info("Enter getUnsignedCSRsImpl");
Json::Value result; Json::Value result;
result["status"] = 0; result["status"] = 0;
result["errorMessage"] = ""; result["errorMessage"] = "";
...@@ -44,7 +44,7 @@ Json::Value GetUnsignedCSRsImpl(){ ...@@ -44,7 +44,7 @@ Json::Value GetUnsignedCSRsImpl(){
return result; return result;
} }
Json::Value SignByHashImpl(const string& hash, int status){ Json::Value signByHashImpl(const string& hash, int status){
Json::Value result; Json::Value result;
result["errorMessage"] = ""; result["errorMessage"] = "";
...@@ -101,14 +101,14 @@ Json::Value SignByHashImpl(const string& hash, int status){ ...@@ -101,14 +101,14 @@ Json::Value SignByHashImpl(const string& hash, int status){
} }
Json::Value CSRManagerServer::GetUnsignedCSRs(){ Json::Value CSRManagerServer::getUnsignedCSRs(){
lock_guard<recursive_mutex> lock(m); lock_guard<recursive_mutex> lock(m);
return GetUnsignedCSRsImpl(); return getUnsignedCSRsImpl();
} }
Json::Value CSRManagerServer::SignByHash(const string& hash, int status){ Json::Value CSRManagerServer::signByHash(const string& hash, int status){
lock_guard<recursive_mutex> lock(m); lock_guard<recursive_mutex> lock(m);
return SignByHashImpl(hash, status); return signByHashImpl(hash, status);
} }
int init_csrmanager_server(){ int init_csrmanager_server(){
......
CSRManagerServer.h
View file @ 0ec388d2
...@@ -20,8 +20,8 @@ class CSRManagerServer : public abstractCSRManagerServer { ...@@ -20,8 +20,8 @@ class CSRManagerServer : public abstractCSRManagerServer {
CSRManagerServer(AbstractServerConnector &connector, serverVersion_t type); CSRManagerServer(AbstractServerConnector &connector, serverVersion_t type);
virtual Json::Value GetUnsignedCSRs(); virtual Json::Value getUnsignedCSRs();
virtual Json::Value SignByHash(const std::string& hash, int status); virtual Json::Value signByHash(const std::string& hash, int status);
}; };
extern int init_csrmanager_server(); extern int init_csrmanager_server();
......
README.md
View file @ 0ec388d2
...@@ -319,7 +319,7 @@ Example: ...@@ -319,7 +319,7 @@ Example:
```bash ```bash
export URL_SGX_WALLET="http://127.0.0.1:1027" export URL_SGX_WALLET="http://127.0.0.1:1027"
curl -X POST --data '{ "jsonrpc": "2.0", "id": 2, "method": "SignCertificate", "params": { "certificate": "-----BEGIN CERTIFICATE REQUEST-----\nMIICYjCCAUoCAQAwHTEbMBkGA1UEAwwSc29tZVZlcnlVbmlxdWVOYW1lMIIBIjAN\nBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3C4ceRhzMAZnG87PwlkzMROHsm3B\ncPydIeiqs1dieuuvVETJqbXAcOENNsGA+AdXjZwFkDuIS24p2yZ8AwuIMAwdMsGa\n5Hzk0ugOy52iPyGEuooqV94nnL6eWw/zryTvkk7j239wMWn5our5Ia1/CBQlXXo2\n4IWTWfWYOz26SWUh4DuvzMOheMVSxg3KLaxpx7Bq09p32lR9xpl53+HqxSDIMYh9\nC3y3kA6NdkKsGE/Jt4WoZ5S5LlrhYjw+PFTeX2lbGDZpn/sxQIM16Pxo2LCfefIa\nik+aZBEAlpn22ljLZ5sEcVgBmOlL+v3waq9u0AaSYzdGFRA+0ceVwU/QTQIDAQAB\noAAwDQYJKoZIhvcNAQELBQADggEBAJXodL69Q/8zDt24AySXK0ksV3C3l5l10Hno\nfF6zKypsYev33CFbZu6HweSgK2f21+DeI9TsGKJxI7K6MUqyH0pJhwlFSeMB5/qP\nJueqXMuvStZSp0GGTaNy7Al/jzOKYNf0ePsv/Rx8NcOdy7RCZE0gW998B5jKb66x\nPgy6QvD8CkZULiRScYlOC8Ex6nc+1Z54pRC1NFWs/ugGyFgLJHy0J2gNkOv6yfsl\nH3V/ocCYSoF4ToUQAxwx+dcy4PXrL9vKzRNJgWzsI/LzCZkglo8iis9YZQawDOUf\nGmDMDkr0Fx1W1tSEpvkw0flkAXZ8PhIGCC0320jkuPeClt7OWNs=\n-----END CERTIFICATE REQUEST-----\n" } }' -H 'content-type:application/json;' $URL_SGX_WALLET curl -X POST --data '{ "jsonrpc": "2.0", "id": 2, "method": "signCertificate", "params": { "certificate": "-----BEGIN CERTIFICATE REQUEST-----\nMIICYjCCAUoCAQAwHTEbMBkGA1UEAwwSc29tZVZlcnlVbmlxdWVOYW1lMIIBIjAN\nBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3C4ceRhzMAZnG87PwlkzMROHsm3B\ncPydIeiqs1dieuuvVETJqbXAcOENNsGA+AdXjZwFkDuIS24p2yZ8AwuIMAwdMsGa\n5Hzk0ugOy52iPyGEuooqV94nnL6eWw/zryTvkk7j239wMWn5our5Ia1/CBQlXXo2\n4IWTWfWYOz26SWUh4DuvzMOheMVSxg3KLaxpx7Bq09p32lR9xpl53+HqxSDIMYh9\nC3y3kA6NdkKsGE/Jt4WoZ5S5LlrhYjw+PFTeX2lbGDZpn/sxQIM16Pxo2LCfefIa\nik+aZBEAlpn22ljLZ5sEcVgBmOlL+v3waq9u0AaSYzdGFRA+0ceVwU/QTQIDAQAB\noAAwDQYJKoZIhvcNAQELBQADggEBAJXodL69Q/8zDt24AySXK0ksV3C3l5l10Hno\nfF6zKypsYev33CFbZu6HweSgK2f21+DeI9TsGKJxI7K6MUqyH0pJhwlFSeMB5/qP\nJueqXMuvStZSp0GGTaNy7Al/jzOKYNf0ePsv/Rx8NcOdy7RCZE0gW998B5jKb66x\nPgy6QvD8CkZULiRScYlOC8Ex6nc+1Z54pRC1NFWs/ugGyFgLJHy0J2gNkOv6yfsl\nH3V/ocCYSoF4ToUQAxwx+dcy4PXrL9vKzRNJgWzsI/LzCZkglo8iis9YZQawDOUf\nGmDMDkr0Fx1W1tSEpvkw0flkAXZ8PhIGCC0320jkuPeClt7OWNs=\n-----END CERTIFICATE REQUEST-----\n" } }' -H 'content-type:application/json;' $URL_SGX_WALLET
``` ```
......
SGXRegistrationServer.cpp
View file @ 0ec388d2
...@@ -65,12 +65,12 @@ SGXRegistrationServer::SGXRegistrationServer(AbstractServerConnector &connector, ...@@ -65,12 +65,12 @@ SGXRegistrationServer::SGXRegistrationServer(AbstractServerConnector &connector,
: AbstractRegServer(connector, type), is_cert_created(false), cert_auto_sign(auto_sign) {} : AbstractRegServer(connector, type), is_cert_created(false), cert_auto_sign(auto_sign) {}
Json::Value SignCertificateImpl(const string& csr, bool auto_sign = false){ Json::Value signCertificateImpl(const string& csr, bool auto_sign = false){
Json::Value result; Json::Value result;
result["status"] = 0; result["status"] = 0;
result["errorMessage"] = ""; result["errorMessage"] = "";
try{ try{
spdlog::info("enter SignCertificateImpl"); spdlog::info("enter signCertificateImpl");
string status = "1"; string status = "1";
string hash = cryptlite::sha256::hash_hex(csr); string hash = cryptlite::sha256::hash_hex(csr);
...@@ -172,13 +172,13 @@ Json::Value GetSertificateImpl(const string& hash){ ...@@ -172,13 +172,13 @@ Json::Value GetSertificateImpl(const string& hash){
} }
Json::Value SGXRegistrationServer::SignCertificate(const string& csr){ Json::Value SGXRegistrationServer::signCertificate(const string& csr){
spdlog::info("Enter SignCertificate "); spdlog::info("Enter signCertificate ");
lock_guard<recursive_mutex> lock(m); lock_guard<recursive_mutex> lock(m);
return SignCertificateImpl(csr, cert_auto_sign); return signCertificateImpl(csr, cert_auto_sign);
} }
Json::Value SGXRegistrationServer::GetCertificate(const string& hash){ Json::Value SGXRegistrationServer::getCertificate(const string& hash){
lock_guard<recursive_mutex> lock(m); lock_guard<recursive_mutex> lock(m);
return GetSertificateImpl(hash); return GetSertificateImpl(hash);
} }
......
SGXRegistrationServer.h
View file @ 0ec388d2
...@@ -44,8 +44,8 @@ public: ...@@ -44,8 +44,8 @@ public:
void set_cert_created(bool b); void set_cert_created(bool b);
virtual Json::Value SignCertificate(const std::string& csr); virtual Json::Value signCertificate(const std::string& csr);
virtual Json::Value GetCertificate(const std::string& hash); virtual Json::Value getCertificate(const std::string& hash);
}; };
......
abstractCSRManagerServer.h
View file @ 0ec388d2
...@@ -12,22 +12,22 @@ class abstractCSRManagerServer : public jsonrpc::AbstractServer<abstractCSRManag ...@@ -12,22 +12,22 @@ class abstractCSRManagerServer : public jsonrpc::AbstractServer<abstractCSRManag
public: public:
abstractCSRManagerServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<abstractCSRManagerServer>(conn, type) abstractCSRManagerServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<abstractCSRManagerServer>(conn, type)
{ {
this->bindAndAddMethod(jsonrpc::Procedure("GetUnsignedCSRs", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &abstractCSRManagerServer::GetUnsignedCSRsI); this->bindAndAddMethod(jsonrpc::Procedure("getUnsignedCSRs", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &abstractCSRManagerServer::getUnsignedCSRsI);
this->bindAndAddMethod(jsonrpc::Procedure("SignByHash", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"hash",jsonrpc::JSON_STRING, "status", jsonrpc::JSON_INTEGER, NULL), &abstractCSRManagerServer::SignByHashI); this->bindAndAddMethod(jsonrpc::Procedure("signByHash", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"hash",jsonrpc::JSON_STRING, "status", jsonrpc::JSON_INTEGER, NULL), &abstractCSRManagerServer::signByHashI);
} }
inline virtual void GetUnsignedCSRsI(const Json::Value &request, Json::Value &response) inline virtual void getUnsignedCSRsI(const Json::Value &request, Json::Value &response)
{ {
(void)request; (void)request;
response = this->GetUnsignedCSRs(); response = this->getUnsignedCSRs();
} }
inline virtual void SignByHashI(const Json::Value &request, Json::Value &response) inline virtual void signByHashI(const Json::Value &request, Json::Value &response)
{ {
response = this->SignByHash( request["hash"].asString(), request["status"].asInt()); response = this->signByHash( request["hash"].asString(), request["status"].asInt());
} }
virtual Json::Value GetUnsignedCSRs() = 0; virtual Json::Value getUnsignedCSRs() = 0;
virtual Json::Value SignByHash(const std::string& hash, int status) = 0; virtual Json::Value signByHash(const std::string& hash, int status) = 0;
}; };
......
abstractregserver.h
View file @ 0ec388d2
...@@ -32,23 +32,23 @@ class AbstractRegServer : public jsonrpc::AbstractServer<AbstractRegServer> ...@@ -32,23 +32,23 @@ class AbstractRegServer : public jsonrpc::AbstractServer<AbstractRegServer>
public: public:
AbstractRegServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<AbstractRegServer>(conn, type) AbstractRegServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<AbstractRegServer>(conn, type)
{ {
this->bindAndAddMethod(jsonrpc::Procedure("SignCertificate", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"certificate",jsonrpc::JSON_STRING, NULL), &AbstractRegServer::SignCertificateI); this->bindAndAddMethod(jsonrpc::Procedure("signCertificate", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"certificate",jsonrpc::JSON_STRING, NULL), &AbstractRegServer::signCertificateI);
this->bindAndAddMethod(jsonrpc::Procedure("GetCertificate", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"hash",jsonrpc::JSON_STRING, NULL), &AbstractRegServer::GetCertificateI); this->bindAndAddMethod(jsonrpc::Procedure("getCertificate", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"hash",jsonrpc::JSON_STRING, NULL), &AbstractRegServer::getCertificateI);
} }
inline virtual void SignCertificateI(const Json::Value &request, Json::Value &response) inline virtual void signCertificateI(const Json::Value &request, Json::Value &response)
{ {
std::cerr << "SignCertificateI in abstr server " << std::endl; std::cerr << "signCertificateI in abstr server " << std::endl;
response = this->SignCertificate( request["certificate"].asString()); response = this->signCertificate( request["certificate"].asString());
} }
inline virtual void GetCertificateI(const Json::Value &request, Json::Value &response) inline virtual void getCertificateI(const Json::Value &request, Json::Value &response)
{ {
response = this->GetCertificate( request["hash"].asString()); response = this->getCertificate( request["hash"].asString());
} }
virtual Json::Value SignCertificate(const std::string& cert) = 0; virtual Json::Value signCertificate(const std::string& cert) = 0;
virtual Json::Value GetCertificate(const std::string& hash) = 0; virtual Json::Value getCertificate(const std::string& hash) = 0;
}; };
......
cert_util.cpp
View file @ 0ec388d2
...@@ -13,7 +13,7 @@ int print_hashes(){ ...@@ -13,7 +13,7 @@ int print_hashes(){
jsonrpc::HttpClient client("http://localhost:1028"); jsonrpc::HttpClient client("http://localhost:1028");
StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2); StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
std::cout << "Client inited" << std::endl; std::cout << "Client inited" << std::endl;
std::cout << c.GetUnsignedCSRs() << std::endl; std::cout << c.getUnsignedCSRs() << std::endl;
exit(0); exit(0);
} }
...@@ -21,7 +21,7 @@ void sign_by_hash(std::string & hash, int status){ ...@@ -21,7 +21,7 @@ void sign_by_hash(std::string & hash, int status){
jsonrpc::HttpClient client("http://localhost:1028"); jsonrpc::HttpClient client("http://localhost:1028");
StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2); StubClient c(client, jsonrpc::JSONRPC_CLIENT_V2);
std::cout << "Client inited" << std::endl; std::cout << "Client inited" << std::endl;
std::cout << c.SignByHash(hash, status) << std::endl; std::cout << c.signByHash(hash, status) << std::endl;
exit(0); exit(0);
} }
......
stubclient.h
View file @ 0ec388d2
...@@ -223,11 +223,11 @@ class StubClient : public jsonrpc::Client ...@@ -223,11 +223,11 @@ class StubClient : public jsonrpc::Client
////CSRManagerServer ////CSRManagerServer
Json::Value GetUnsignedCSRs() throw (jsonrpc::JsonRpcException) Json::Value getUnsignedCSRs() throw (jsonrpc::JsonRpcException)
{ {
Json::Value p; Json::Value p;
p = Json::nullValue; p = Json::nullValue;
Json::Value result = this->CallMethod("GetUnsignedCSRs",p); Json::Value result = this->CallMethod("getUnsignedCSRs",p);
if (result.isObject()) if (result.isObject())
return result; return result;
else else
...@@ -236,12 +236,12 @@ class StubClient : public jsonrpc::Client ...@@ -236,12 +236,12 @@ class StubClient : public jsonrpc::Client
Json::Value SignByHash(const std::string& hash, int status) throw (jsonrpc::JsonRpcException) Json::Value signByHash(const std::string& hash, int status) throw (jsonrpc::JsonRpcException)
{ {
Json::Value p; Json::Value p;
p["hash"] = hash; p["hash"] = hash;
p["status"] = status; p["status"] = status;
Json::Value result = this->CallMethod("SignByHash",p); Json::Value result = this->CallMethod("signByHash",p);
if (result.isObject()) if (result.isObject())
return result; return result;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment