interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 #1832

stolowski · Sep 2, 2016

Added new timedate-control interface and updated two existing interfaces: timeserver-control and timezone-control to allow access to respective parts of systemd' org.freedesktop.timedate1 interface (lp #1616052).

The test shamelessly stolen from unity7_test.go.

Tested introspection and a property getter manually with:

$ timedatetest.gdbus introspect --system --dest org.freedesktop.timedate1 --object-path /org/freedesktop/timedate1
$ timedatetest.gdbus call --system --dest org.freedesktop.timedate1 --object-path /org/freedesktop/timedate1 --method org.freedesktop.DBus.Properties.Get "org.freedesktop.timedate1" "Timezone"

with the following simple snap:

name: timedatetest
version: 1.0
summary: A test
description: A test

apps:
gdbus:
command: usr/bin/gdbus
plugs: [timedate-control]

parts:
gdbus:
plugin: nil
stage-packages:
- libglib2.0-bin

zyga · Sep 2, 2016

zyga reviewed Sep 2, 2016

View changes

Why send and receive? // my knowledge of apparmor is rusty here.

Fair point. receive is needed for property change signals (and only for them) and it was a little bit too lenient. I've split this block into two and added comments - property change signals need 'receive', Get & GetAll need 'send'.

zyga · Sep 2, 2016

zyga reviewed Sep 2, 2016

View changes

This is inconsistent with the file name, either call the module time_data_control.go or rename the interface to timedate-control.

Ok, renamed to timedate-control.

zyga · Sep 2, 2016

Please document this interface so that we know what it allows to do (in docs/interfaces.md) and decide if it is reserved (restricted to trusted snaps) or not. I'd say it is and it should auto-connect.

I have one question about apparmor, please ask @jdstrand for a review after you know the answer to my question.

stolowski · Sep 2, 2016

@zyga I've added a short doc and made it auto-connect. I'm not sure however about the making it 'reserved', is it about marking it reservedForOs (which it is already)?

niemeyer · Sep 19, 2016

Needs conflict solving, and a review from @jdstrand. LGTM other than that.

jdstrand · Sep 22, 2016

jdstrand requested changes Sep 22, 2016

View changes

I think this PR should be renamed as "support time and date settings via 'org.freedesktop.timedate1" and you should add the timedate-control interface (please rename from time-date-control to timedate-control) and update the timezone-control and timeserver-control as described (each should work without the others, so add the seccomp and dbus introspection rules to all 3).

We already have the timeserver-control interface for NTP. NTP calls should be moved there.

We already have the timezone-control interface for adjusting TZ. TZ calls should be moved there.

SetTime and SetLocalRTC can remain here.

Unfortunately we can't mediate on method data and systemd only provides Get methods for properties, so you'll need to have these two rules in timezone-control and timeserver-control. This means that all the time* interfaces will be able to read each others properties, but at least they won't be able to Set them.

Adjusting the time on a system is a privileged action and this should not autoconnect.

jdstrand · Sep 22, 2016

'time-control' is probably a better name than timedate-control. Will want @niemeyer to weigh in on that.

stolowski · Sep 23, 2016

@jdstrand Thanks for the review, I have followed your suggestions and moved some permissions to the other interfaces. All interfaces have permissions to read the properties as well as to introspect timedate1 object.

zyga · Sep 23, 2016

zyga reviewed Sep 23, 2016

View changes

Let's drop this test please. We just concluded a large simplification where those tests were axed.

Ok, removed.

jdstrand · Sep 26, 2016

jdstrand reviewed Sep 26, 2016

View changes

+1 on security policy changes. Please adjust docs/interfaces.md and implicit.go

I think that 'time-control' would be a nicer name for this interface. @niemeyer, can you comment on if you prefer 'timedate-control' or 'time-control' (or something else)?

Can we rephrase this to be:

Can set system time and date and query systemd-timedated for time information.

It's possible we may allow setting the time or the date in other ways (eg, like we do with timezone-control and timeserver-control).

Can you update this to be:

Can manage timeservers via systemd-timedated and directly separate from ``config core``

### timezone-control

Can manage timezone via systemd-timedated and directly separate from ``config core``

* Auto-Connect: no

In other words, update timeserver-control to reference systemd-timedated and add timezone-control.

@jdstrand apologies for forgetting about this change, I'll address it in a separete PR.

Can you put this in alphabetical order?

jdstrand · Sep 26, 2016

jdstrand approved these changes Sep 26, 2016

View changes

jdstrand · Sep 26, 2016

Note that I approved the changes you made, but still request further changes (using github's 'comment' mechanism instead of 'request changes' to avoid blocking on me).

niemeyer · Sep 27, 2016

+1 on time-control if we intend this interface to remain intermediating the ability to set the time even if we change the backend.

niemeyer · Sep 27, 2016

niemeyer approved these changes Sep 27, 2016

View changes

LGTM once @jdstrand is happy.

jdstrand · Sep 27, 2016

"+1 on time-control if we intend this interface to remain intermediating the ability to set the time even if we change the backend."

Yes this is the intent. In this manner it is similar to timezone-control and timeserver-control.

@stolowski - we now have agreement. Please rename to 'time-control' and I can do the final review.

stolowski · Sep 28, 2016

@jdstrand @niemeyer Ok, renamed to time-control and address other comments re docs (and I hope I didn't miss anything).

jdstrand · Sep 28, 2016

FYI, the request to add timezone-control to docs/interfaces.md was missed in this merge.

stolowski added some commits Sep 1, 2016

Added timedate_control interface file

c6c5858

Fixes

2785097

Added a test

235656a

Fix policy

6c0a554

stolowski added some commits Sep 2, 2016

Renamed to timedate-control

8f62b27

Added doc

c5a7eda

Tweaks to the apparmor policy

1e1cb3d

niemeyer changed the title from Added time-date-control interface for org.freedesktop.timedate1 to interfaces/builtin: time-date-control for org.freedesktop.timedate1 Sep 19, 2016

stolowski added some commits Sep 20, 2016

Merge branch 'master' into timedate-interface

dc157a5

Fix expected values in the test

ce54c15

Merge branch 'master' into timedate-interface

1e1d4c3

stolowski added some commits Sep 23, 2016

Merge branch 'master' into timedate-interface

0c0e5e2

Addressed review comments

6b33141

Fix test

4ae0883

Check that seccomp snippet is not empty in timezone and timeserver co…
…ntrol interfaces

97159df

Comments

e9f9084

stolowski changed the title from interfaces/builtin: time-date-control for org.freedesktop.timedate1 to interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 Sep 23, 2016

stolowski added some commits Sep 25, 2016

Removed the test for unused security systems

6171153

Merge branch 'master' into timedate-interface

b4892d0

niemeyer added the Reviewed label Sep 27, 2016

stolowski added some commits Sep 28, 2016

Renamed to time-control, doc updates according to review comments

b5e2d73

Renamed to time-control, doc updates according to review comments

c0d9f8c

Fix name of the variable

0b080c6

Fix naming in the tests

46c5752

niemeyer merged commit 677ed08 into snapcore:master Sep 28, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

stolowski referenced this pull request Sep 29, 2016
Merged
doc: added timezone-control to interfaces doc #2028

+        +// NewTimeDateControlInterface returns a new "time-date-control" interface.
+        +func NewTimeDateControlInterface() interfaces.Interface {
+        +	return &commonInterface{
+        +		name: "time-date-control",

+        +    bus=system
+        +    path=/org/freedesktop/timedate1
+        +    interface=org.freedesktop.timedate1
+        +    member="Set{Time,Timezone,LocalRTC,NTP}"

+        +    path=/org/freedesktop/timedate1
+        +    interface=org.freedesktop.DBus.Properties
+        +    member=PropertiesChanged
+        +    peer=(label=unconfined),

+        +		connectedPlugAppArmor: timeDateControlConnectedPlugAppArmor,
+        +		connectedPlugSecComp:  timeDateControlConnectedPlugSecComp,
+        +		reservedForOS:         true,
+        +		autoConnect:           true,

+        +all properties of /org/freedesktop/timedate1 D-Bus object.
+        +
+        +* Auto-Connect: yes
+        +
          ### timeserver-control
          Can manage timeservers directly separate from ``config core``.

snapcore/snapd

interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 #1832

stolowski commented Sep 2, 2016 •

Edited 1 time

stolowski
Sep 23, 2016

stolowski added some commits Sep 1, 2016

zyga reviewed Sep 2, 2016

View changes

zyga reviewed Sep 2, 2016

View changes

zyga commented Sep 2, 2016

stolowski added some commits Sep 2, 2016

stolowski commented Sep 2, 2016

niemeyer commented Sep 19, 2016

niemeyer changed the title from Added time-date-control interface for org.freedesktop.timedate1 to interfaces/builtin: time-date-control for org.freedesktop.timedate1 Sep 19, 2016

stolowski added some commits Sep 20, 2016

jdstrand requested changes Sep 22, 2016

View changes

jdstrand commented Sep 22, 2016

stolowski added some commits Sep 23, 2016

stolowski changed the title from interfaces/builtin: time-date-control for org.freedesktop.timedate1 to interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 Sep 23, 2016

stolowski commented Sep 23, 2016

zyga reviewed Sep 23, 2016

View changes

stolowski added some commits Sep 25, 2016

jdstrand reviewed Sep 26, 2016

View changes

jdstrand approved these changes Sep 26, 2016

View changes

jdstrand commented Sep 26, 2016

niemeyer commented Sep 27, 2016

niemeyer approved these changes Sep 27, 2016

View changes

niemeyer added the Reviewed label Sep 27, 2016

jdstrand commented Sep 27, 2016

stolowski added some commits Sep 28, 2016

stolowski commented Sep 28, 2016

niemeyer merged commit `677ed08` into snapcore:master Sep 28, 2016
1 check passed

1 check passed

jdstrand commented Sep 28, 2016

stolowski referenced this pull request Sep 29, 2016

doc: added timezone-control to interfaces doc #2028

snapcore/snapd

Join GitHub today

interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 #1832

Conversation

stolowski commented Sep 2, 2016 • edited Edited 1 time stolowski Sep 23, 2016

stolowski added some commits Sep 1, 2016

zyga reviewed Sep 2, 2016 View changes

zyga reviewed Sep 2, 2016 View changes

zyga commented Sep 2, 2016

stolowski added some commits Sep 2, 2016

stolowski commented Sep 2, 2016

niemeyer commented Sep 19, 2016

niemeyer changed the title from Added time-date-control interface for org.freedesktop.timedate1 to interfaces/builtin: time-date-control for org.freedesktop.timedate1 Sep 19, 2016

stolowski added some commits Sep 20, 2016

jdstrand requested changes Sep 22, 2016 View changes

jdstrand Sep 22, 2016 • edited Edited 1 time jdstrand Sep 22, 2016

jdstrand commented Sep 22, 2016

stolowski added some commits Sep 23, 2016

stolowski changed the title from interfaces/builtin: time-date-control for org.freedesktop.timedate1 to interfaces/builtin: support time and date settings via 'org.freedesktop.timedate1 Sep 23, 2016

stolowski commented Sep 23, 2016

zyga reviewed Sep 23, 2016 View changes

stolowski added some commits Sep 25, 2016

jdstrand reviewed Sep 26, 2016 View changes

jdstrand approved these changes Sep 26, 2016 View changes

jdstrand commented Sep 26, 2016

niemeyer commented Sep 27, 2016

niemeyer approved these changes Sep 27, 2016 View changes

niemeyer added the Reviewed label Sep 27, 2016

jdstrand commented Sep 27, 2016

stolowski added some commits Sep 28, 2016

stolowski commented Sep 28, 2016

Hide details View details niemeyer merged commit 677ed08 into snapcore:master Sep 28, 2016 1 check passed

1 check passed

jdstrand commented Sep 28, 2016

stolowski referenced this pull request Sep 29, 2016

stolowski commented Sep 2, 2016 •

Edited 1 time

stolowski
Sep 23, 2016

zyga reviewed Sep 2, 2016

View changes

zyga reviewed Sep 2, 2016

View changes

jdstrand requested changes Sep 22, 2016

View changes

jdstrand Sep 22, 2016 •

Edited 1 time

jdstrand
Sep 22, 2016

zyga reviewed Sep 23, 2016

View changes

jdstrand reviewed Sep 26, 2016

View changes

jdstrand approved these changes Sep 26, 2016

View changes

niemeyer approved these changes Sep 27, 2016

View changes

niemeyer merged commit `677ed08` into snapcore:master Sep 28, 2016
1 check passed