openkylin
/
libkysdk-base
mirror of https://gitee.com/openkylin/libkysdk-base.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

update changelog

This commit is contained in:
shaozhimin 2023-12-12 14:34:52 +08:00 committed by openkylin-cibot
parent 03d90a6f73
commit 5d423582c6
3 changed files with 262 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
libkysdk-base (2.2.0.0-0k0.5) yangtze; urgency=medium
* BUG号 : 无
* 需求号 : 无
* 其他修改 : 恢复diagnostics 模块内容
-- szm-min <shaozhimin@kylinos.cn> Tue, 12 Dec 2023 14:34:05 +0800
libkysdk-base (2.2.0.0-0k0.4) yangtze; urgency=medium
* BUG号 : 无

253
debian/patches/0004-update-changelog.patch vendored Normal file
View File

@ -0,0 +1,253 @@
From: shaozhimin <shaozhimin@kylinos.cn>
Date: Tue, 12 Dec 2023 14:34:52 +0800
Subject: update changelog
---
src/diagnostics/buriedpoint.cpp | 196 +---------------------------------------
src/diagnostics/buriedpoint.h | 4 -
2 files changed, 1 insertion(+), 199 deletions(-)
diff --git a/src/diagnostics/buriedpoint.cpp b/src/diagnostics/buriedpoint.cpp
index 689594c..10576ee 100644
--- a/src/diagnostics/buriedpoint.cpp
+++ b/src/diagnostics/buriedpoint.cpp
@@ -31,15 +31,6 @@ constexpr char dbusObjectName[] = "/com/kylin/daq";
constexpr char dbusInterfaceName[] = "com.kylin.daq.interface";
constexpr char dbusMehtodName[] = "UploadMessage";
-constexpr char publicKey[] = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FR\
-OEFNSUlCQ2dLQ0FRRUFzdW1NTFJEdlFNb0tEQkRJODRqSgpqc1A0Mk55V0pWVEZob2Jra3ZiT05j\
-dExYTXVzRmo2TzJUblZYU3Z6VlVLSjRqZkpwT2l2WEphOVB5Z2wzYTRnClBzSU40enNCMEdOY0tr\
-R3VsS2RrV2x6S3lWQ2xlTzhiQnN6SjkwbTc3cWF6YWg3a1A0TUl0WTVFczBpSkpiR0oKN1MxcERj\
-MlJkNnVFQWJLaXJyRTFlNzlFTEd4am5VN2V5NWkyRDE2WWJoZEQwZ2lNa2RHR3piQXBKTWZWRVJR\
-TQo1NXorMFVqdS8zSFJhNFY3b3p2TGRPRE5HUURaeWNJU0l3VHBLbFR3RjBxazdCNjVhTUlJenQ1\
-dnhOK1lxYU1GClppZFRLNzcxNjdqNEExZ3F3MG45bjlybWVXUGRWZ3dudnRtVXp4Q1krNk05SXpK\
-TDI3eWpRUTV1WGQ3RVdMT3IKbndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==";
-
const std::string configPath = getenv("HOME") + std::string("/") + ".config/buriedpoint/uploadmessage.conf";
}
@@ -67,11 +58,8 @@ bool BuriedPoint::uploadMessage(std::string packageName , std::string messageTyp
/* 获取上传数据 */
std::string uploadData = getUploadData(data);
- /* 加密 */
- std::string enEncoded = encrypt(uploadData , publicKey);
-
/* 调用 d-bus */
- if (!callDbus(pkgInfo , uploadData , enEncoded)) {
+ if (!callDbus(pkgInfo , uploadData , "")) {
std::cout << "kdk : buried point d-bus call fail !" << std::endl;
return false;
}
@@ -133,187 +121,6 @@ std::string BuriedPoint::getCurrentTime(void)
return std::string(currTime);
}
-std::string BuriedPoint::encrypt(const std::string &uploadData, const std::string &keyBase64)
-{
- BIO *bio = NULL;
- RSA *p_rsa = NULL;
- EVP_PKEY *key = NULL;
- EVP_PKEY_CTX *ctx = NULL;
- unsigned char *out;
- size_t outlen;
-
- /* uploadData 取 sha256 */
- unsigned char hash[SHA256_DIGEST_LENGTH];
- SHA256_CTX sha256;
- SHA256_Init(&sha256);
- SHA256_Update(&sha256 , uploadData.c_str() , uploadData.size());
- SHA256_Final(hash , &sha256);
-
- /* 解码 key */
- std::string tempKey = base64Decode(keyBase64 , keyBase64.size());
-
- if ((bio = BIO_new_mem_buf(tempKey.c_str(), tempKey.size())) == NULL) {
- evpError();
- return std::string();
- }
-
- if ((p_rsa = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL)) == NULL) {
- evpError();
- BIO_free(bio);
- return std::string();
- }
-
- key = EVP_PKEY_new();
-
- if (key == NULL) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- return std::string();
- }
-
- if (EVP_PKEY_set1_RSA(key, p_rsa) <= 0) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- return std::string();
- }
-
- ctx = EVP_PKEY_CTX_new(key, NULL);
-
- if (ctx == NULL) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- return std::string();
- }
-
- if (EVP_PKEY_encrypt_init(ctx) <= 0) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
- return std::string();
- }
-
- /* 设置填充方式为OAEP */
- if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_OAEP_PADDING) <= 0) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
- return std::string();
- }
-
- /* 确定加密buf长度 */
- if (EVP_PKEY_encrypt(ctx, NULL, &outlen, hash , SHA256_DIGEST_LENGTH) <= 0) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
- return std::string();
- }
-
- out = (unsigned char *)OPENSSL_malloc(outlen);
-
- if (!out) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
- return std::string();
- }
-
- /* 进行加密 */
- if (EVP_PKEY_encrypt(ctx, out, &outlen, hash, SHA256_DIGEST_LENGTH) <= 0) {
- evpError();
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
- OPENSSL_free(out);
- return std::string();
- }
-
- /* base64 编码 */
- std::string ret = base64(out , outlen);
-
- OPENSSL_free(out);
- BIO_free(bio);
- RSA_free(p_rsa);
- EVP_PKEY_free(key);
- EVP_PKEY_CTX_free(ctx);
-
- return ret;
-}
-
-void BuriedPoint::evpError(void)
-{
- char szErr[512];
- char errStr[1024];
- int n = ERR_get_error();
-
- ERR_error_string(n, szErr);
- sprintf(errStr, "error code = %d , code string = %s", n, szErr);
-
- std::cout << errStr << std::endl;
-
- return;
-}
-
-std::string BuriedPoint::base64(const unsigned char *src , int length)
-{
- BUF_MEM *bptr;
-
- BIO *b64 = BIO_new(BIO_f_base64());
- BIO_set_flags(b64 , BIO_FLAGS_BASE64_NO_NL);
- BIO *bmem = BIO_new(BIO_s_mem());
- b64 = BIO_push(b64 , bmem);
- BIO_write(b64 , src , length);
- BIO_flush(b64);
- BIO_get_mem_ptr(b64 , &bptr);
-
- char *buff = (char *)malloc(bptr->length + 1);
- memcpy(buff , bptr->data , bptr->length);
- buff[bptr->length] = 0;
-
- BIO_free_all(b64);
-
- std::string ret(buff);
- free(buff);
-
- return ret;
-}
-
-std::string BuriedPoint::base64Decode(const std::string &src , int length)
-{
- char *buf = (char *)malloc(length);
- memset(buf , 0 , length);
-
- BIO *b64 = BIO_new(BIO_f_base64());
- BIO_set_flags(b64 , BIO_FLAGS_BASE64_NO_NL);
- BIO_set_close(b64 , BIO_CLOSE);
-
- BIO *bmem = BIO_new_mem_buf(src.c_str() , length);
-
- bmem = BIO_push(b64 , bmem);
-
- BIO_read(bmem , buf , length);
-
- BIO_free_all(bmem);
-
- std::string ret(buf);
- free(buf);
-
- return ret;
-}
-
bool BuriedPoint::callDbus(const std::string &pkgInfo , const std::string &uploadData , const std::string &uploadDataSha256)
{
DBusConnection *conn;
@@ -429,7 +236,6 @@ std::string BuriedPoint::readTid(void)
if (ifs.is_open()) {
std::getline(ifs , ret);
} else {
- std::cout << "kdk : open uploadmessage file fail !" << std::endl;
return "";
}
diff --git a/src/diagnostics/buriedpoint.h b/src/diagnostics/buriedpoint.h
index 0011e9a..18563dc 100644
--- a/src/diagnostics/buriedpoint.h
+++ b/src/diagnostics/buriedpoint.h
@@ -38,10 +38,6 @@ private:
bool checkDir(void);
std::string getUploadData(std::map<std::string , std::string> &data);
std::string getCurrentTime(void);
- std::string encrypt(const std::string &md5 , const std::string &keyBase64);
- std::string base64(const unsigned char *src , int length);
- std::string base64Decode(const std::string &src , int length);
- void evpError(void);
bool callDbus(const std::string &pkgInfo , const std::string &uploadData , const std::string &uploadMessageSha256);
std::string readTid(void);
bool writeTid(std::string tid);

1
debian/patches/series vendored
View File

@ -1,3 +1,4 @@
0001-Merge-tag-upstream-2.2.0.0-into-openkylin-yangtze.patch
0002-update-changelog.patch
0003-log-update-changelog.patch
0004-update-changelog.patch