Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move D-Bus support from bridge into usbguard-daemon. #319

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Move D-Bus support from bridge into usbguard-daemon. #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fc2ab1
Refactor IPCServerPrivate to allow for multiple implementations.
Allen-Webb Jul 23, 2019
b1f39b9
Move DBus bridge into DBusIPCServerPrivate.
Allen-Webb Jul 23, 2019
14040ad
Update tests now that usbguard-dbus was moved into usbguard-daemon.
Allen-Webb Jul 24, 2019
bd4a9d3
Setup D-Bus policy for tests.
Allen-Webb Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 19 additions & 46 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,14 @@ libusbguard_la_SOURCES=\
src/Library/IPCClientPrivate.hpp \
src/Library/IPCPrivate.cpp \
src/Library/IPCPrivate.hpp \
src/Library/IPCServerPrivate.cpp \
src/Library/IPCServerPrivate.hpp \
src/Library/Init.cpp \
src/Library/KeyValueParserPrivate.cpp \
src/Library/KeyValueParserPrivate.hpp \
src/Library/LocaltimeCondition.cpp \
src/Library/LocaltimeCondition.hpp \
src/Library/QBIPCServerPrivate.hpp \
src/Library/QBIPCServerPrivate.cpp \
src/Library/RandomStateCondition.cpp \
src/Library/RandomStateCondition.hpp \
src/Library/RuleAppliedCondition.cpp \
Expand Down Expand Up @@ -433,67 +434,53 @@ usbguard_rule_parser_LDADD=\
$(top_builddir)/libusbguard.la

#
# DBus Bridge
# DBus
#
if DBUS_ENABLED
sbin_PROGRAMS+= usbguard-dbus
libusbguard_la_SOURCES+= \
src/Library/DBusConstants.hpp \
src/Library/DBusIPCServerPrivate.hpp \
src/Library/DBusIPCServerPrivate.cpp

libusbguard_la_CPPFLAGS+=\
-I$(top_builddir)/src/DBus \
@dbus_CFLAGS@

libusbguard_la_LIBADD+=\
@dbus_LIBS@

if DOCS_ENABLED
man8_MANS+=\
$(top_builddir)/doc/man/usbguard-dbus.8
endif

BUILT_SOURCES+=\
src/DBus/DBusInterface.xml.cstr \
src/DBus/org.usbguard1.service \
src/DBus/usbguard-dbus.service
src/DBus/DBusInterface.xml.cstr

EXTRA_DIST+=\
src/DBus/org.usbguard1.conf \
src/DBus/org.usbguard1.service.in \
src/DBus/usbguard-dbus.service.in \
src/DBus/org.usbguard1.policy \
src/DBus/DBusInterface.xml

CLEANFILES+=\
$(top_builddir)/src/DBus/org.usbguard1.service \
$(top_builddir)/src/DBus/usbguard-dbus.service \
$(top_builddir)/src/DBus/DBusInterface.xml.cstr

usbguard_dbus_SOURCES=\
src/DBus/gdbus-server.cpp \
src/DBus/DBusBridge.cpp \
src/DBus/DBusBridge.hpp

usbguard_dbus_CPPFLAGS=\
-fPIE \
$(AM_CPPFLAGS) \
-I$(top_builddir)/src/DBus \
@dbus_CFLAGS@

usbguard_dbus_LDADD=\
$(top_builddir)/libusbguard.la \
@dbus_LIBS@

%.xml:
xmllint "$(top_srcdir)/$@" > /dev/null

%.xml.cstr: %.xml
$(MKDIR_P) $(dir $@)
XMLLINT_INDENT="" xmllint --noblanks --format "$<" |\
sed -n -e '/<!--/,/-->/ d; s|\"|\\"|g; s|.*|"&"|; p' > "$(top_builddir)/$@"

%.service: %.service.in
sed -e "s|%{sbindir}%|$(sbindir)|" "$<" > "$(top_builddir)/$@"

install-data-dbus: $(top_builddir)/src/DBus/org.usbguard1.service install-polkit-policy install-systemd-dbus-service
$(MKDIR_P) $(DESTDIR)$(DBUS_SERVICES_DIR) && \
$(INSTALL_DATA) $(top_builddir)/src/DBus/org.usbguard1.service $(DESTDIR)$(DBUS_SERVICES_DIR)
install-data-dbus: install-polkit-policy
$(MKDIR_P) $(DESTDIR)$(DBUS_BUSCONFIG_DIR) && \
$(INSTALL_DATA) $(top_srcdir)/src/DBus/org.usbguard1.conf $(DESTDIR)$(DBUS_BUSCONFIG_DIR)

uninstall-data-dbus: uninstall-polkit-policy uninstall-systemd-dbus-service
rm -f $(DESTDIR)$(DBUS_SERVICES_DIR)/org.usbguard1.service
rmdir $(DESTDIR)$(DBUS_SERVICES_DIR)
uninstall-data-dbus: uninstall-polkit-policy
rm -f $(DESTDIR)$(DBUS_BUSCONFIG_DIR)/org.usbguard1.conf
rmdir $(DESTDIR)$(DBUS_BUSCONFIG_DIR)

Expand Down Expand Up @@ -526,21 +513,7 @@ uninstall-polkit-policy:
else
install-polkit-policy:
uninstall-polkit-policy:
endif

if SYSTEMD_SUPPORT_ENABLED
install-systemd-dbus-service: $(top_builddir)/src/DBus/usbguard-dbus.service
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) && \
$(INSTALL_DATA) $(top_builddir)/src/DBus/usbguard-dbus.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)

uninstall-systemd-dbus-service:
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/usbguard-dbus.service
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR)

else
install-systemd-dbus-service:
uninstall-systemd-dbus-service:
endif
endif #POLICYKIT_ENABLED
else
install-data-dbus:
uninstall-data-dbus:
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ CPPFLAGS=$SAVE_CPPFLAGS
#
# GLib D-Bus
#
AC_ARG_WITH([dbus], AC_HELP_STRING([--with-dbus], [Build the DBus Bridge service]), [], [with_dbus=yes])
AC_ARG_WITH([dbus], AC_HELP_STRING([--with-dbus], [Build with DBus support]), [], [with_dbus=yes])
if test "x$with_dbus" = xyes; then
#
# Check for required D-Bus modules
Expand Down
Loading