Merge lp:~alan-griffiths/mir/make-endpoint-accessible-option into lp:mir

[Alan Griffiths]

options: add a config option to "chmod a=rw <endpoint>" if exposed on filesystem

options: add a config option to "chmod a=rw <endpoint>" if exposed on filesystem

[Andreas Pokorny (andreas-pokorny)]

looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2287
http://jenkins.qa.ubuntu.com/job/mir-ci/2888/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/885
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1134
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4185
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17720

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2888/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

okay overall, althoug I guess I like "globally-rw-file" over "arw-file". We might also want to control based on unix groups, and not need such broad permission

nits:
spacing:
61 + chmod(the_socket_file().c_str(), S_IRUSR|S_IWUSR| S_IRGRP|S_IWGRP | S_IROTH|S_IWOTH);

review: Approve

[Alberto Aguirre (albaguirre)]

OK, makes it convenient for devs.

review: Approve

[Alan Griffiths (alan-griffiths)]

> okay overall, althoug I guess I like "globally-rw-file" over "arw-file". We
> might also want to control based on unix groups, and not need such broad
> permission

Well, the option could take a string we search for u|g|o|a - any votes?

--rw-file arg (=a) Make socket filename rw
                                        (equivalent to chmod <arg>=rw)

[Alan Griffiths (alan-griffiths)]

> > okay overall, althoug I guess I like "globally-rw-file" over "arw-file". We
> > might also want to control based on unix groups, and not need such broad
> > permission
>
> Well, the option could take a string we search for u|g|o|a - any votes?
>
> --rw-file arg (=a) Make socket filename rw
> (equivalent to chmod <arg>=rw)

review: Needs Information

[Chris Halse Rogers (raof)]

I'm somewhat hesitant to introduce this; it's somewhat of a workaround for us not being able to run Mir in a window in X, which it looks like Cemil is actually going to do soon.

If we are going to introduce it, I think it should be as minimal as possible. I'd prefer “make utterly insecure socket” over “set security for socket”.

[Alan Griffiths (alan-griffiths)]

> I'm somewhat hesitant to introduce this; it's somewhat of a workaround for us
> not being able to run Mir in a window in X,

Actually, no - it isn't a workaround. This is what one of our downstream projects (USC) does and I think it is likely useful for the system compositor case (where the protection is done by other means).

> which it looks like Cemil is actually going to do soon.
>
> If we are going to introduce it, I think it should be as minimal as possible.
> I'd prefer “make utterly insecure socket” over “set security for socket”.

That was my thinking too.

review: Abstain

[Chris Halse Rogers (raof)]

Wait, USC publishes a world-readable socket? Sadface.

[Daniel van Vugt (vanvugt)]

New functions need a new stanza, I think...

35 +++ src/platform/symbols.map 2015-02-03 13:54:49 +0000
36 @@ -103,6 +103,7 @@
37 mir::graphics::Renderable::transformation*;
38 mir::graphics::UserDisplayConfigurationOutput::extents*;
39 mir::graphics::UserDisplayConfigurationOutput::UserDisplayConfigurationOutput*;
40 + mir::options::arw_server_socket_opt*;

review: Needs Fixing

[lp:~alan-griffiths/mir/make-endpoint-accessible-option]

2288. By Alan Griffiths on 2015-02-04

Separate new entry point into a new symbol map stanza

2289. By Alan Griffiths on 2015-02-04

merge lp:mir

2290. By Alan Griffiths on 2015-02-04

Fix spurious change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2290
http://jenkins.qa.ubuntu.com/job/mir-ci/2915/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/912
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/912/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1170
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4214
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17773

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2915/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[lp:~alan-griffiths/mir/make-endpoint-accessible-option]

2291. By Alan Griffiths on 2015-02-05

merge lp:mir

=== modified file 'src/include/platform/mir/options/configuration.h'
--- src/include/platform/mir/options/configuration.h	2015-02-04 08:45:38 +0000
+++ src/include/platform/mir/options/configuration.h	2015-02-04 17:40:42 +0000
@@ -30,6 +30,7 @@
 extern char const* const server_socket_opt;
 extern char const* const prompt_socket_opt;
 extern char const* const no_server_socket_opt;
+extern char const* const arw_server_socket_opt;
 extern char const* const enable_input_opt;
 extern char const* const session_mediator_report_opt;
 extern char const* const msg_processor_report_opt;

=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2015-02-04 08:45:38 +0000
+++ src/platform/options/default_configuration.cpp	2015-02-04 17:40:42 +0000
@@ -32,6 +32,7 @@
 char const* const mo::server_socket_opt           = "file,f";
 char const* const mo::prompt_socket_opt           = "prompt-file,p";
 char const* const mo::no_server_socket_opt        = "no-file";
+char const* const mo::arw_server_socket_opt       = "arw-file";
 char const* const mo::enable_input_opt            = "enable-input,i";
 char const* const mo::session_mediator_report_opt = "session-mediator-report";
 char const* const mo::msg_processor_report_opt    = "msg-processor-report";
@@ -116,6 +117,7 @@
         (server_socket_opt, po::value<std::string>()->default_value(::mir::default_server_socket),
             "Socket filename [string:default=$XDG_RUNTIME_DIR/mir_socket or /tmp/mir_socket]")
         (no_server_socket_opt, "Do not provide a socket filename for client connections")
+        (arw_server_socket_opt, "Make socket filename globally rw (equivalent to chmod a=rw)")
         (prompt_socket_opt, "Provide a \"..._trusted\" filename for prompt helper connections")
         (platform_graphics_lib, po::value<std::string>(),
             "Library to use for platform graphics support (default: autodetect)")

=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2015-02-04 08:45:38 +0000
+++ src/platform/symbols.map	2015-02-04 17:40:42 +0000
@@ -259,3 +259,11 @@
   };
  local: *;
 };
+
+MIRPLATFORM_6.1
+{
+global:
+  extern "C++" {
+    mir::options::arw_server_socket_opt*;
+  };
+} MIRPLATFORM_6;

=== modified file 'src/server/frontend/default_configuration.cpp'
--- src/server/frontend/default_configuration.cpp	2015-01-21 07:34:50 +0000
+++ src/server/frontend/default_configuration.cpp	2015-02-04 17:40:42 +0000
@@ -64,12 +64,17 @@
             }
             else
             {
-                return std::make_shared<mf::PublishedSocketConnector>(
+                auto const result = std::make_shared<mf::PublishedSocketConnector>(
                     the_socket_file(),
                     the_connection_creator(),
                     threads,
                     *the_emergency_cleanup(),
                     the_connector_report());
+
+                if (the_options()->is_set(options::arw_server_socket_opt))
+                    chmod(the_socket_file().c_str(), S_IRUSR|S_IWUSR| S_IRGRP|S_IWGRP | S_IROTH|S_IWOTH);
+
+                return result;
             }
         });
 }