Merge pull request #25 from jqln-0/master

Validate ObjectPath before use in Conn.GetUnitProperties

Author: philips

dbus/methods.go

@@ -17,6 +17,7 @@ limitations under the License.
 package dbus
 
 import (
+	"errors"
 	"github.com/guelfey/go.dbus"
 )
 
@@ -145,6 +146,9 @@ func (c *Conn) GetUnitProperties(unit string) (map[string]interface{}, error) {
 	var props map[string]dbus.Variant
 
 	path := ObjectPath("/org/freedesktop/systemd1/unit/" + unit)
+	if !path.IsValid() {
+		return nil, errors.New("invalid unit name: " + unit)
+	}
 
 	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
 	err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, "org.freedesktop.systemd1.Unit").Store(&props)

dbus/methods_test.go

@@ -138,3 +138,18 @@ func TestGetUnitProperties(t *testing.T) {
 		t.Fatal("unexpected wants for /")
 	}
 }
+
+// TestGetUnitPropertiesRejectsInvalidName attempts to get the properties for a
+// unit with an invalid name. This test should be run with --test.timeout set,
+// as a fail will manifest as GetUnitProperties hanging indefinitely.
+func TestGetUnitPropertiesRejectsInvalidName(t *testing.T) {
+	conn := setupConn(t)
+
+	unit := "//invalid#$^/"
+
+	_, err := conn.GetUnitProperties(unit)
+
+	if err == nil {
+		t.Fatal("Expected an error, got nil")
+	}
+}

dbus/set_test.go

@@ -6,7 +6,7 @@ import (
 
 // TestBasicSetActions asserts that Add & Remove behavior is correct
 func TestBasicSetActions(t *testing.T) {
-	s := set{}
+	s := newSet()
 
 	if s.Contains("foo") {
 		t.Fatal("set should not contain 'foo'")