external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

relax permissions checking to let non-privileged use miracalcast.

Browse source 
we will enhance this by fine grained permission conrol latter.
This commit is contained in:
Derek Dai 2017-03-03 08:59:37 +08:00
parent 2108b1d195
commit cb821562ed
No known key found for this signature in database
GPG key ID: E109CC97553EF009
3 changed files with 30 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

81
res/org.freedesktop.miracle.conf
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <!--*-nxml-*--> <?xml version="1.0"?> <!--*-nxml-*-->
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<!-- <!--
This file is part of MiracleCast. This file is part of MiracleCast.
@ -8,67 +8,26 @@
<busconfig> <busconfig>
<policy user="root"> <policy user="root">
<allow own="org.freedesktop.miracle"/> <allow own="org.freedesktop.miracle"/>
<allow own="org.freedesktop.miracle.wifi"/> <allow own="org.freedesktop.miracle.wifi"/>
<allow own="org.freedesktop.miracle.wfd"/> <allow own="org.freedesktop.miracle.wfd"/>
<allow send_destination="org.freedesktop.miracle"/> <allow send_destination="org.freedesktop.miracle"/>
<allow send_destination="org.freedesktop.miracle.wifi"/> <allow send_destination="org.freedesktop.miracle.wifi"/>
<allow send_destination="org.freedesktop.miracle.wfd"/> <allow send_destination="org.freedesktop.miracle.wfd"/>
<allow receive_sender="org.freedesktop.miracle"/> <allow receive_sender="org.freedesktop.miracle"/>
<allow receive_sender="org.freedesktop.miracle.wifi"/> <allow receive_sender="org.freedesktop.miracle.wifi"/>
<allow receive_sender="org.freedesktop.miracle.wfd"/> <allow receive_sender="org.freedesktop.miracle.wfd"/>
</policy> </policy>
<policy context="default"> <policy context="default">
<deny send_destination="org.freedesktop.miracle"/> <allow send_destination="org.freedesktop.miracle"/>
<deny send_destination="org.freedesktop.miracle.wifi"/> <allow send_destination="org.freedesktop.miracle.wifi"/>
<deny send_destination="org.freedesktop.miracle.wfd"/> <allow send_destination="org.freedesktop.miracle.wfd"/>
<allow send_destination="org.freedesktop.miracle" <allow receive_sender="org.freedesktop.miracle"/>
send_interface="org.freedesktop.DBus.Introspectable"/> <allow receive_sender="org.freedesktop.miracle.wifi"/>
<allow send_destination="org.freedesktop.miracle.wifi" <allow receive_sender="org.freedesktop.miracle.wfd"/>
send_interface="org.freedesktop.DBus.Introspectable"/> </policy>
<allow send_destination="org.freedesktop.miracle.wfd"
send_interface="org.freedesktop.DBus.Introspectable"/>
<allow send_destination="org.freedesktop.miracle"
send_interface="org.freedesktop.DBus.Peer"/>
<allow send_destination="org.freedesktop.miracle.wifi"
send_interface="org.freedesktop.DBus.Peer"/>
<allow send_destination="org.freedesktop.miracle.wfd"
send_interface="org.freedesktop.DBus.Peer"/>
<allow send_destination="org.freedesktop.miracle"
send_interface="org.freedesktop.DBus.ObjectManager"/>
<allow send_destination="org.freedesktop.miracle.wifi"
send_interface="org.freedesktop.DBus.ObjectManager"/>
<allow send_destination="org.freedesktop.miracle.wfd"
send_interface="org.freedesktop.DBus.ObjectManager"/>
<allow send_destination="org.freedesktop.miracle"
send_interface="org.freedesktop.DBus.Properties"
send_member="Get"/>
<allow send_destination="org.freedesktop.miracle.wifi"
send_interface="org.freedesktop.DBus.Properties"
send_member="Get"/>
<allow send_destination="org.freedesktop.miracle.wfd"
send_interface="org.freedesktop.DBus.Properties"
send_member="Get"/>
<allow send_destination="org.freedesktop.miracle"
send_interface="org.freedesktop.DBus.Properties"
send_member="GetAll"/>
<allow send_destination="org.freedesktop.miracle.wifi"
send_interface="org.freedesktop.DBus.Properties"
send_member="GetAll"/>
<allow send_destination="org.freedesktop.miracle.wfd"
send_interface="org.freedesktop.DBus.Properties"
send_member="GetAll"/>
<allow receive_sender="org.freedesktop.miracle"/>
<allow receive_sender="org.freedesktop.miracle.wifi"/>
<allow receive_sender="org.freedesktop.miracle.wfd"/>
</policy>
</busconfig> </busconfig>

8
src/ctl/wfd-dbus.c
View file

@ -622,7 +622,7 @@ static const sd_bus_vtable wfd_dbus_vtable[] = {
static const sd_bus_vtable wfd_dbus_sink_vtable[] = { static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
SD_BUS_VTABLE_START(0), SD_BUS_VTABLE_START(0),
SD_BUS_METHOD("StartSession", "sqqqq", "o", wfd_dbus_sink_start_session, 0), SD_BUS_METHOD("StartSession", "sqqqq", "o", wfd_dbus_sink_start_session, SD_BUS_VTABLE_UNPRIVILEGED),
/*SD_BUS_PROPERTY("AudioFormats", "a{sv}", wfd_dbus_sink_get_audio_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/ /*SD_BUS_PROPERTY("AudioFormats", "a{sv}", wfd_dbus_sink_get_audio_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
/*SD_BUS_PROPERTY("VideoFormats", "a{sv}", wfd_dbus_sink_get_video_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/ /*SD_BUS_PROPERTY("VideoFormats", "a{sv}", wfd_dbus_sink_get_video_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
/*SD_BUS_PROPERTY("HasAudio", "b", wfd_dbus_sink_has_audio, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/ /*SD_BUS_PROPERTY("HasAudio", "b", wfd_dbus_sink_has_audio, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
@ -634,9 +634,9 @@ static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
static const sd_bus_vtable wfd_dbus_session_vtable[] = { static const sd_bus_vtable wfd_dbus_session_vtable[] = {
SD_BUS_VTABLE_START(0), SD_BUS_VTABLE_START(0),
SD_BUS_METHOD("Resume", NULL, NULL, wfd_dbus_session_resume, 0), SD_BUS_METHOD("Resume", NULL, NULL, wfd_dbus_session_resume, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Pause", NULL, NULL, wfd_dbus_session_pause, 0), SD_BUS_METHOD("Pause", NULL, NULL, wfd_dbus_session_pause, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Teardown", NULL, NULL, wfd_dbus_session_teardown, 0), SD_BUS_METHOD("Teardown", NULL, NULL, wfd_dbus_session_teardown, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_PROPERTY("Sink", "o", wfd_dbus_session_get_sink, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Sink", "o", wfd_dbus_session_get_sink, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Url", "o", wfd_dbus_get_session_presentation_url, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("Url", "o", wfd_dbus_get_session_presentation_url, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("State", "i", wfd_dbus_get_session_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("State", "i", wfd_dbus_get_session_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),

12
src/wifi/wifid-dbus.c
View file

@ -261,12 +261,12 @@ static const sd_bus_vtable peer_dbus_vtable[] = {
"ss", "ss",
NULL, NULL,
peer_dbus_connect, peer_dbus_connect,
0), SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Disconnect", SD_BUS_METHOD("Disconnect",
NULL, NULL,
NULL, NULL,
peer_dbus_disconnect, peer_dbus_disconnect,
0), SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_PROPERTY("Link", SD_BUS_PROPERTY("Link",
"o", "o",
peer_dbus_get_link, peer_dbus_get_link,
@ -719,25 +719,25 @@ static const sd_bus_vtable link_dbus_vtable[] = {
link_dbus_get_friendly_name, link_dbus_get_friendly_name,
link_dbus_set_friendly_name, link_dbus_set_friendly_name,
0, 0,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_WRITABLE_PROPERTY("Managed", SD_BUS_WRITABLE_PROPERTY("Managed",
"b", "b",
link_dbus_get_managed, link_dbus_get_managed,
link_dbus_set_managed, link_dbus_set_managed,
0, 0,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_WRITABLE_PROPERTY("P2PScanning", SD_BUS_WRITABLE_PROPERTY("P2PScanning",
"b", "b",
link_dbus_get_p2p_scanning, link_dbus_get_p2p_scanning,
link_dbus_set_p2p_scanning, link_dbus_set_p2p_scanning,
0, 0,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_WRITABLE_PROPERTY("WfdSubelements", SD_BUS_WRITABLE_PROPERTY("WfdSubelements",
"s", "s",
link_dbus_get_wfd_subelements, link_dbus_get_wfd_subelements,
link_dbus_set_wfd_subelements, link_dbus_set_wfd_subelements,
0, 0,
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE | SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END SD_BUS_VTABLE_END
}; };