2019-01-19 03:58:52

by Stotland, Inga

Subject: [PATCH BlueZ v2 0/2] Updated mesh D-Bus policy patch

This Addresses Marcel's comments:
mesh daemion executable is renamed to bluetooth-meshd and
the D-Bus policy is name accordingly bluetooth-mesh.conf

Inga Stotland (2):
mesh: Rename mesh daemon executable to bluetooth-meshd
mesh: Add D-Bus policy for Bluetooth mesh daemon

Makefile.mesh | 14 ++++++++++----
mesh/bluetooth-mesh.conf | 22 ++++++++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 mesh/bluetooth-mesh.conf

--
2.17.2

2019-01-19 03:58:55

by Stotland, Inga

Subject: [PATCH BlueZ v2 1/2] mesh: Rename mesh daemon executable to bluetooth-meshd

---
Makefile.mesh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.mesh b/Makefile.mesh
index ea6c5e939..66854e0bf 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -22,9 +22,9 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \
mesh/prov-acceptor.c mesh/prov-initiator.c \
mesh/pb-adv.h mesh/pb-adv.c \
mesh/mesh-defs.h
-libexec_PROGRAMS += mesh/meshd
+libexec_PROGRAMS += mesh/bluetooth-meshd

-mesh_meshd_SOURCES = $(mesh_sources) mesh/main.c
-mesh_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
-mesh_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la
+mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c
+mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
+mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la
endif
--
2.17.2

2019-01-19 03:59:07

by Stotland, Inga

Subject: [PATCH BlueZ v2 2/2] mesh: Add D-Bus policy for Bluetooth mesh daemon

This adds new D-Bus policy file bluetooth-mesh.conf
---
Makefile.mesh | 6 ++++++
mesh/bluetooth-mesh.conf | 22 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 mesh/bluetooth-mesh.conf

diff --git a/Makefile.mesh b/Makefile.mesh
index 66854e0bf..28c87a061 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -1,5 +1,9 @@
if MESH

+if DATAFILES
+dbus_DATA += mesh/bluetooth-mesh.conf
+endif
+
mesh_sources = mesh/mesh.h mesh/mesh.c \
mesh/net_keys.h mesh/net_keys.c \
mesh/mesh-io.h mesh/mesh-io.c \
@@ -27,4 +31,6 @@ libexec_PROGRAMS += mesh/bluetooth-meshd
mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c
mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c
mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la
+
+EXTRA_DIST += mesh/bluetooth-mesh.conf
endif
diff --git a/mesh/bluetooth-mesh.conf b/mesh/bluetooth-mesh.conf
new file mode 100644
index 000000000..28be7c649
--- /dev/null
+++ b/mesh/bluetooth-mesh.conf
@@ -0,0 +1,22 @@
+<!-- This configuration file specifies the required security policies
+ for Bluetooth mesh daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+ <policy user="root">
+ <allow own="org.bluez.mesh"/>
+ <allow send_destination="org.bluez.mesh"/>
+ <allow send_interface="org.bluez.mesh.Application1"/>
+ <allow send_interface="org.bluez.mesh.Element1"/>
+ <allow send_interface="org.bluez.mesh.ProvisionAgent1"/>
+ </policy>
+
+ <policy context="default">
+ <allow send_destination="org.bluez.mesh"/>
+ </policy>
+
+</busconfig>
--
2.17.2

2019-02-04 20:12:32

by Gix, Brian

Subject: Re: [PATCH BlueZ v2 0/2] Updated mesh D-Bus policy patch

Applied

On Fri, 2019-01-18 at 19:58 -0800, Inga Stotland wrote:
> This Addresses Marcel's comments:
> mesh daemion executable is renamed to bluetooth-meshd and
> the D-Bus policy is name accordingly bluetooth-mesh.conf
>
> Inga Stotland (2):
> mesh: Rename mesh daemon executable to bluetooth-meshd
> mesh: Add D-Bus policy for Bluetooth mesh daemon
>
> Makefile.mesh | 14 ++++++++++----
> mesh/bluetooth-mesh.conf | 22 ++++++++++++++++++++++
> 2 files changed, 32 insertions(+), 4 deletions(-)
> create mode 100644 mesh/bluetooth-mesh.conf
>