aiden
/
appmotor
mirror of https://github.com/cutefishos/appmotor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from sailfishos/jb54874

Browse Source 
[invoker] Add --id option. JB#54874 OMP#JOLLA-241
pull/1/head
Tomi Leppänen 4 years ago committed by GitHub
parent fc1fad883a 25445d7db5
commit 6d0a407a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File

14
src/common/sailjail.c
Unescape Escape View File

@ -198,22 +198,22 @@ sailjail_application_info(DBusConnection *con, const char *desktop)
switch (dbus_message_iter_get_arg_type(&variantIter)) { switch (dbus_message_iter_get_arg_type(&variantIter)) {
case DBUS_TYPE_INT32: case DBUS_TYPE_INT32:
dbus_message_iter_get_basic(&variantIter, &value); dbus_message_iter_get_basic(&variantIter, &value);
warning("%s = int32:%d", key, value.i32); debug("%s = int32:%d", key, value.i32);
g_hash_table_insert(info, g_strdup(key), g_variant_new_int32(value.i32)); g_hash_table_insert(info, g_strdup(key), g_variant_new_int32(value.i32));
break; break;
case DBUS_TYPE_UINT32: case DBUS_TYPE_UINT32:
dbus_message_iter_get_basic(&variantIter, &value); dbus_message_iter_get_basic(&variantIter, &value);
warning("%s = uint32:%d", key, value.u32); debug("%s = uint32:%d", key, value.u32);
g_hash_table_insert(info, g_strdup(key), g_variant_new_uint32(value.u32)); g_hash_table_insert(info, g_strdup(key), g_variant_new_uint32(value.u32));
break; break;
case DBUS_TYPE_BOOLEAN: case DBUS_TYPE_BOOLEAN:
dbus_message_iter_get_basic(&variantIter, &value); dbus_message_iter_get_basic(&variantIter, &value);
warning("%s = bool:%d", key, value.bool_val); debug("%s = bool:%d", key, value.bool_val);
g_hash_table_insert(info, g_strdup(key), g_variant_new_boolean(value.bool_val)); g_hash_table_insert(info, g_strdup(key), g_variant_new_boolean(value.bool_val));
break; break;
case DBUS_TYPE_STRING: case DBUS_TYPE_STRING:
dbus_message_iter_get_basic(&variantIter, &value); dbus_message_iter_get_basic(&variantIter, &value);
warning("%s = string:'%s'", key, value.str); debug("%s = string:'%s'", key, value.str);
g_hash_table_insert(info, g_strdup(key), g_variant_new_string(value.str)); g_hash_table_insert(info, g_strdup(key), g_variant_new_string(value.str));
break; break;
case DBUS_TYPE_ARRAY: case DBUS_TYPE_ARRAY:
@ -229,7 +229,7 @@ sailjail_application_info(DBusConnection *con, const char *desktop)
if (!iter_at(&valueIter, DBUS_TYPE_STRING)) if (!iter_at(&valueIter, DBUS_TYPE_STRING))
break; break;
dbus_message_iter_get_basic(&valueIter, &value); dbus_message_iter_get_basic(&valueIter, &value);
warning("%s[%d] = string:'%s'", key, i, value.str); debug("%s[%d] = string:'%s'", key, i, value.str);
dbus_message_iter_next(&valueIter); dbus_message_iter_next(&valueIter);
v[i++] = g_strdup(value.str); v[i++] = g_strdup(value.str);
@ -259,7 +259,7 @@ EXIT:
dbus_message_unref(rsp); dbus_message_unref(rsp);
if (req) if (req)
dbus_message_unref(req); dbus_message_unref(req);
warning("info received = %s", info ? "true" : "false"); debug("info received = %s", info ? "true" : "false");
return info; return info;
} }
@ -312,7 +312,7 @@ EXIT:
if (req) if (req)
dbus_message_unref(req); dbus_message_unref(req);
warning("launch permitted = %s", granted ? "true" : "false"); info("launch permitted = %s", granted ? "true" : "false");
return granted; return granted;
} }

36
src/invoker/invoker.c
Unescape Escape View File

@ -611,6 +611,8 @@ static void usage(int status)
" from the booster. The score is reset to 0 normally.\n" " from the booster. The score is reset to 0 normally.\n"
" -T, --test-mode Invoker test mode. Also control file in root home should be in place.\n" " -T, --test-mode Invoker test mode. Also control file in root home should be in place.\n"
" -F, --desktop-file Desktop file of the application to notify lipstick of launching app.\n" " -F, --desktop-file Desktop file of the application to notify lipstick of launching app.\n"
" -I, --id Sandboxing id to check if sandboxing should be forced.\n"
" If this is not defined, it's guessed from binary name.\n"
" -h, --help Print this help.\n" " -h, --help Print this help.\n"
" -v, --verbose Make invoker more verbose. Can be given several times.\n" " -v, --verbose Make invoker more verbose. Can be given several times.\n"
"\n" "\n"
@ -772,6 +774,7 @@ typedef struct InvokeArgs {
unsigned int respawn_delay; unsigned int respawn_delay;
bool test_mode; bool test_mode;
const char *desktop_file; const char *desktop_file;
char *sandboxing_id;
unsigned int exit_delay; unsigned int exit_delay;
} InvokeArgs; } InvokeArgs;
@ -786,6 +789,7 @@ typedef struct InvokeArgs {
.respawn_delay = RESPAWN_DELAY,\ .respawn_delay = RESPAWN_DELAY,\
.test_mode = false,\ .test_mode = false,\
.desktop_file = NULL,\ .desktop_file = NULL,\
.sandboxing_id = NULL,\
.exit_delay = EXIT_DELAY,\ .exit_delay = EXIT_DELAY,\
} }
@ -963,6 +967,7 @@ int main(int argc, char *argv[])
{"splash", required_argument, NULL, 'S'}, // Legacy, ignored {"splash", required_argument, NULL, 'S'}, // Legacy, ignored
{"splash-landscape", required_argument, NULL, 'L'}, // Legacy, ignored {"splash-landscape", required_argument, NULL, 'L'}, // Legacy, ignored
{"desktop-file", required_argument, NULL, 'F'}, {"desktop-file", required_argument, NULL, 'F'},
{"id", required_argument, NULL, 'I'},
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -971,7 +976,7 @@ int main(int argc, char *argv[])
// The use of + for POSIXLY_CORRECT behavior is a GNU extension, but avoids polluting // The use of + for POSIXLY_CORRECT behavior is a GNU extension, but avoids polluting
// the environment // the environment
int opt; int opt;
while ((opt = getopt_long(argc, argv, "+hvcwnGDsoTd:t:a:Ar:S:L:F:", longopts, NULL)) != -1) while ((opt = getopt_long(argc, argv, "+hvcwnGDsoTd:t:a:Ar:S:L:F:I:", longopts, NULL)) != -1)
{ {
switch(opt) switch(opt)
{ {
@ -1043,6 +1048,10 @@ int main(int argc, char *argv[])
args.desktop_file = optarg; args.desktop_file = optarg;
break; break;
case 'I':
args.sandboxing_id = strdup(optarg);
break;
case '?': case '?':
usage(1); usage(1);
} }
@ -1115,25 +1124,36 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// If sailjail is already used or app specific booster is used, skip checking for sandboxing
if (!strcmp(args.prog_name, SAILJAIL_PATH) || strcmp(args.app_name, UNDEFINED_APPLICATION)) {
args.sandboxing_id = NULL;
} else if (!args.sandboxing_id) {
// When id is not defined, assume it can be derived from binary path
char *path = strdup(args.prog_name);
args.sandboxing_id = strdup(basename(path));
free(path);
}
// Application specific boosters are running in sandbox and can // Application specific boosters are running in sandbox and can
// thus launch only sandboxed processes, otherwise // thus launch only sandboxed processes, otherwise
// If arguments don't define sailjail and sailjaild says the app must be sandboxed, // If arguments don't define sailjail and sailjaild says the app must be sandboxed,
// we force sandboxing here // we force sandboxing here
if (!strcmp(args.app_name, UNDEFINED_APPLICATION) && if (args.sandboxing_id && ask_for_sandboxing(args.sandboxing_id)) {
strcmp(args.prog_name, SAILJAIL_PATH) &&
ask_for_sandboxing(args.prog_name)) {
warning("enforcing sandboxing for '%s'", args.prog_name); warning("enforcing sandboxing for '%s'", args.prog_name);
// We must use generic booster here as nothing else would work // We must use generic booster here as nothing else would work
// to run sailjail which is not compiled for launching via booster // to run sailjail which is not compiled for launching via booster
args.app_type = BOOSTER_GENERIC; args.app_type = BOOSTER_GENERIC;
// Prepend sailjail // Prepend sailjail
char **old_argv = args.prog_argv; char **old_argv = args.prog_argv;
args.prog_argc += 2; args.prog_argc += 4;
args.prog_argv = (char **)calloc(args.prog_argc + 1, sizeof *args.prog_argv); args.prog_argv = (char **)calloc(args.prog_argc + 1, sizeof *args.prog_argv);
args.prog_argv[0] = SAILJAIL_PATH; args.prog_argv[0] = SAILJAIL_PATH;
args.prog_argv[1] = "--"; args.prog_argv[1] = "-p";
for (int i = 2; i < args.prog_argc + 1; ++i) args.prog_argv[2] = args.sandboxing_id,
args.prog_argv[i] = old_argv[i-2]; args.sandboxing_id = NULL;
args.prog_argv[3] = "--";
for (int i = 4; i < args.prog_argc + 1; ++i)
args.prog_argv[i] = old_argv[i-4];
// Don't free old_argv because it's probably not dynamically allocated // Don't free old_argv because it's probably not dynamically allocated
free(args.prog_name); free(args.prog_name);
args.prog_name = strdup(SAILJAIL_PATH); args.prog_name = strdup(SAILJAIL_PATH);

Write Preview
Loading…
Cancel
Save