amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

在开启on_http_access hook时，访问http文件(或目录)ip白名单机制不生效

Browse Source 
on_http_access hook优先级更高，关闭on_http_access hook时才采用ip白名单机制，防止两种鉴权机制间的冲突
This commit is contained in:
xia-chu 2023-07-27 15:39:43 +08:00
parent dfae1aee97
commit c1f6517471
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/WebHook.cpp
View File

@ -625,7 +625,11 @@ void installWebHook() {
if (!hook_enable || hook_http_access.empty()) {
// 未开启http文件访问鉴权，那么允许访问，但是每次访问都要鉴权；
// 因为后续随时都可能开启鉴权(重载配置文件后可能重新开启鉴权)
invoker("", "", 0);
if (!HttpFileManager::isIPAllowed(sender.get_peer_ip())) {
invoker("Your ip is not allowed to access the service.", "", 0);
} else {
invoker("", "", 0);
}
return;
}

5
src/Http/HttpFileManager.cpp
View File

@ -382,11 +382,6 @@ static void canAccessPath(Session &sender, const Parser &parser, const MediaInfo
return;
}
if (!HttpFileManager::isIPAllowed(sender.get_peer_ip())) {
callback("Your ip is not allowed to access the service.", nullptr);
return;
}
// 事件未被拦截，则认为是http下载请求
bool flag = NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastHttpAccess, parser, path, is_dir, accessPathInvoker, static_cast<SockInfo &>(sender));
if (!flag) {