Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Eclipse Foundation
Eclipse Mosquitto
提交
9bb80585
E
Eclipse Mosquitto
项目概览
镜像
/
Eclipse Foundation
/
Eclipse Mosquitto
大约 1 年 前同步成功
通知
36
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
Eclipse Mosquitto
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9bb80585
编写于
6月 08, 2023
作者:
R
Roger A. Light
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reject Will messages that attempt to publish to $CONTROL/.
上级
4ca294fd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
60 addition
and
0 deletion
+60
-0
ChangeLog.txt
ChangeLog.txt
+3
-0
src/handle_connect.c
src/handle_connect.c
+4
-0
test/broker/07-will-control.py
test/broker/07-will-control.py
+51
-0
test/broker/Makefile
test/broker/Makefile
+1
-0
test/broker/test.py
test/broker/test.py
+1
-0
未找到文件。
ChangeLog.txt
浏览文件 @
9bb80585
Security:
- Broker will reject Will messages that attempt to publish to $CONTROL/.
Broker:
- Fix $SYS messages being expired after 60 seconds and hence unchanged values
disappearing.
...
...
src/handle_connect.c
浏览文件 @
9bb80585
...
...
@@ -375,6 +375,10 @@ static int will__read(struct mosquitto *context, const char *client_id, struct m
will_struct
->
msg
.
topic
=
will_topic_mount
;
}
if
(
!
strncmp
(
will_struct
->
msg
.
topic
,
"$CONTROL/"
,
strlen
(
"$CONTROL/"
))){
rc
=
MOSQ_ERR_ACL_DENIED
;
goto
error_cleanup
;
}
rc
=
mosquitto_pub_topic_check
(
will_struct
->
msg
.
topic
);
if
(
rc
)
goto
error_cleanup
;
...
...
test/broker/07-will-control.py
0 → 100755
浏览文件 @
9bb80585
#!/usr/bin/env python3
# Test whether a client setting a will with $CONTROL in is denied
from
mosq_test_helper
import
*
def
do_test
(
start_broker
,
proto_ver
):
rc
=
1
mid
=
1
connect_packet
=
mosq_test
.
gen_connect
(
"will"
,
will_topic
=
"$CONTROL/dynamic-security/v1"
,
will_payload
=
b
"will-message"
,
proto_ver
=
proto_ver
)
port
=
mosq_test
.
get_port
()
if
start_broker
:
broker
=
mosq_test
.
start_broker
(
filename
=
os
.
path
.
basename
(
__file__
),
port
=
port
)
try
:
sock
=
mosq_test
.
client_connect_only
(
port
=
port
)
sock
.
send
(
connect_packet
)
d
=
sock
.
recv
(
1
)
if
d
==
b
""
:
rc
=
0
sock
.
close
()
except
mosq_test
.
TestError
:
pass
except
Exception
as
e
:
print
(
e
)
finally
:
if
start_broker
:
broker
.
terminate
()
broker
.
wait
()
(
stdo
,
stde
)
=
broker
.
communicate
()
if
rc
:
print
(
stde
.
decode
(
'utf-8'
))
exit
(
rc
)
else
:
return
rc
def
all_tests
(
start_broker
=
False
):
rc
=
do_test
(
start_broker
,
proto_ver
=
4
)
if
rc
:
return
rc
;
rc
=
do_test
(
start_broker
,
proto_ver
=
5
)
if
rc
:
return
rc
;
return
0
if
__name__
==
'__main__'
:
all_tests
(
True
)
test/broker/Makefile
浏览文件 @
9bb80585
...
...
@@ -125,6 +125,7 @@ msg_sequence_test:
./06-bridge-reconnect-local-out.py
07
:
./07-will-control.py
./07-will-delay-invalid-573191.py
./07-will-delay-reconnect.py
./07-will-delay-recover.py
...
...
test/broker/test.py
浏览文件 @
9bb80585
...
...
@@ -101,6 +101,7 @@ tests = [
(
3
,
'./06-bridge-per-listener-settings.py'
),
(
2
,
'./06-bridge-reconnect-local-out.py'
),
(
1
,
'./07-will-control.py'
),
(
1
,
'./07-will-delay-invalid-573191.py'
),
(
1
,
'./07-will-delay-reconnect.py'
),
(
1
,
'./07-will-delay-recover.py'
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录