refactor(webhook): 统一回调函数签名并添加缺失的头文件

ctkqiang · ctkqiang · commit 1763fcf013bf · 2025-10-14T20:31:50.000+08:00
修改所有webhook发送函数的回调签名，使其接收对应平台结构体指针
添加缺失的系统头文件和openssl相关头文件
更新Makefile以包含新增的webhook源文件和依赖库
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y libpcap-dev libncurses5-dev make gcc
+        sudo apt-get install -y libpcap-dev libncurses5-dev libssl-dev libcurl4-openssl-dev libjson-c-dev make gcc
 
     - name: Build project
       run: |
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -7,6 +7,7 @@
         "/opt/homebrew/Cellar/libpcap/1.10.5/include",
         "/opt/homebrew/Cellar/libpcap/1.10.5/include/pcap",
         "/usr/local/include",
+        "/opt/homebrew/opt/openssl@3/",
         "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1",
         "/Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/17/include",
         "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 CC := gcc
 PKG := pkg-config
 TARGET := anyintruder
-SRCS := any_intruder.c src/monitor.c src/logger.c src/ui.c src/file_utilities.c src/webhook/telegram.c src/platform_webhook.c src/http_client.c
+SRCS := any_intruder.c src/monitor.c src/logger.c src/ui.c src/file_utilities.c src/webhook/telegram.c src/platform_webhook.c src/http_client.c src/webhook/dingding.c src/webhook/discord.c src/webhook/wechat.c
 OBJS := $(SRCS:.c=.o)
 
 BREW_PCAP := $(shell command -v brew >/dev/null 2>&1 && brew --prefix libpcap 2>/dev/null || echo)
@@ -17,11 +17,11 @@ PCAP_LIBS   := $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG) --libs libpca
 NCURSES_CFLAGS := $(shell $(PKG) --cflags ncurses 2>/dev/null || echo)
 NCURSES_LIBS   := $(shell $(PKG) --libs ncurses 2>/dev/null || echo)
 
-CFLAGS := -Wall -O2 -Iinclude -pthread $(PCAP_CFLAGS) $(NCURSES_CFLAGS)
-LIBS := $(PCAP_LIBS) $(NCURSES_LIBS)
+CFLAGS := -Wall -O2 -Iinclude $(shell pkg-config --cflags openssl) $(shell pkg-config --cflags libcurl) $(shell pkg-config --cflags json-c) -pthread $(PCAP_CFLAGS) $(NCURSES_CFLAGS)
+LIBS := $(shell pkg-config --libs openssl) $(shell pkg-config --libs libcurl) $(shell pkg-config --libs json-c) $(PCAP_LIBS) $(NCURSES_LIBS)
 
 ifeq ($(strip $(LIBS)),)
-LIBS := -lpcap -lncurses
+LIBS := -L/usr/local/opt/openssl/lib -lpcap -lncurses -lssl -lcrypto
 endif
 
 .PHONY: all run clean
diff --git a/any_intruder.c b/any_intruder.c
@@ -78,42 +78,51 @@ void wx_cleanup(WeChat *wechat) {
  * @return int 发送状态码（成功为 0x0，失败为非零值）
  */
 int send_to(Platform Platform, const char *log_content) {
+    DING_DING dingding;
+    Discord discord;
+    WeChat bot;
+    char *webhook_url;
+    int result = -0x1;
+
     switch (Platform) {
         case PLATFORM_TELEGRAM:
             return telegram_send_message(log_content);
-        case PLATFORM_DINGDING:
-            DING_DING dingding;
 
+        case PLATFORM_DINGDING:
             if(dingding_init(&dingding) != 0x0) {
                 fprintf(stderr, "Failed to initialize dingding webhook\n");
                 return -0x1;
             }
+            result = dingding_send(&dingding, log_content, dingding_cleanup);
+            break;
 
-            return dingding_send(&dingding, log_content, dingding_cleanup);
         case PLATFORM_DISCORD:
-            Discord discord;
-
-            char *webhook_url = yaml_get_value("discord_webhook_url");
-
+            webhook_url = yaml_get_value("discord_webhook_url");
             if(discord_bot_init(&discord, webhook_url) != 0x0) {
                 fprintf(stderr, "Failed to initialize discord webhook\n");
                 return -0x1;
             }
-
-            return discord_bot_send(&discord, "user", log_content, NULL);
+            result = discord_bot_send(&discord, "user", log_content, NULL);
+            break;
 
         case PLATFORM_WECHAT:
-            WeChat bot;
-
-            if (wechat_bot_init(&bot, "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=XXXXXX") != 0x0) {
+            if (wechat_bot_init(&bot, "https://qyapi.d?key=XXXXXX") != 0x0) {
                 fprintf(stderr, "初始化失败\n");
                 return 0x1;
             }
-
-            return wechat_bot_send(&bot, log_content, wx_cleanup);
-        default:
-            return -0x1;
+            result = wechat_bot_send(&bot, log_content, wx_cleanup);
+            break;
+
+        case PLATFORM_SLACK:
+        case PLATFORM_MSTEAMS:
+        case PLATFORM_NONE:
+        case PLATFORM_FEISHU:
+            fprintf(stderr, "Platform not implemented yet\n");
+            result = -0x1;
+            break;
     }
+    
+    return result;
 }
 
 /**
diff --git a/includes/webhook/dingding.h b/includes/webhook/dingding.h
@@ -14,7 +14,7 @@ typedef struct {
 
 int dingding_init(DING_DING *dingding);
 
-int dingding_send(DING_DING *dingding, char *message, void *(then)(void));
+int dingding_send(DING_DING *dingding, const char *message, void (*then)(DING_DING *));
 
 char *dingding_get_access_token(DING_DING *dingding);
 char *dingding_get_secret(DING_DING *dingding);
diff --git a/includes/webhook/wechat.h b/includes/webhook/wechat.h
@@ -22,6 +22,6 @@ int wechat_bot_init(WeChat *wechat, const char *webhook_url);
  * @param message - 文本内容
  * @param then - 发送完成回调函数（可为空）
  */
-int wechat_bot_send(WeChat *wechat, const char *message, void (*then)(void));
+int wechat_bot_send(WeChat *wechat, const char *message, void (*then)(WeChat *));
 
 #endif
diff --git a/src/webhook/dingding.c b/src/webhook/dingding.c
@@ -1,3 +1,17 @@
+#include <unistd.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/hmac.h>
+#include <curl/curl.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/hmac.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/hmac.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -86,7 +100,7 @@ int dingding_init(DING_DING *dingding) {
  * @param then 发送完成后的回调函数
  * @return int 发送状态码（成功为 0x0，失败为非零值）
  */
-int dingding_send(DING_DING *dingding, char *message, void (*then) (void)) {
+int dingding_send(DING_DING *dingding, const char *message, void (*then)(DING_DING *)) {
     assert(dingding != NULL);
     assert(message != NULL);
 
@@ -116,8 +130,8 @@ int dingding_send(DING_DING *dingding, char *message, void (*then) (void)) {
 
     if (!curl) {
         fprintf(stderr, "Failed to init CURL\n");
-        free(base64_sig);
-        free(url_sig);
+        free(base64_signature);
+        free(url_signature);
         return -2;
     }
 
@@ -158,7 +172,7 @@ int dingding_send(DING_DING *dingding, char *message, void (*then) (void)) {
     free(url_signature);
     free(base64_signature);
 
-    if (then) then();
+    if (then) then(dingding);
     sleep(0x5);
 
     return (response == CURLE_OK) ? 0x0 : -0x3;
diff --git a/src/webhook/discord.c b/src/webhook/discord.c
@@ -1,3 +1,6 @@
+#include <unistd.h>
+#include <json-c/json.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/webhook/wechat.c b/src/webhook/wechat.c
@@ -29,7 +29,7 @@ int wechat_bot_init(WeChat *wechat, const char *webhook_url) {
  * 企业微信发送文本消息（使用官方 webhook REST 接口）
  * 文档参考：https://developer.work.weixin.qq.com/document/path/91770
  */
-int wechat_bot_send(WeChat *wechat, const char *message, void (*then)(void)) {
+int wechat_bot_send(WeChat *wechat, const char *message, void (*then)(WeChat *)) {
     char payload[0x1000];
  
     if (!wechat || !wechat->webhook_url || !message) {
@@ -77,7 +77,7 @@ int wechat_bot_send(WeChat *wechat, const char *message, void (*then)(void)) {
     curl_slist_free_all(headers);
     curl_easy_cleanup(curl);
 
-    if (then) then();
+    if (then) then(wechat);
 
     return 0x0;
 }
