-
Notifications
You must be signed in to change notification settings - Fork 579
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6575 from zyga/tweak/refactor-sc-main-4
cmd/snap-confine: pass sc_invocation instead of numerous args around
- Loading branch information
Showing
8 changed files
with
199 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright (C) 2019 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| #include "snap-confine-invocation.h" | ||
|
|
||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| #include "../libsnap-confine-private/cleanup-funcs.h" | ||
| #include "../libsnap-confine-private/snap.h" | ||
| #include "../libsnap-confine-private/string-utils.h" | ||
| #include "../libsnap-confine-private/utils.h" | ||
|
|
||
| void sc_init_invocation(sc_invocation *inv, const struct sc_args *args, const char *snap_instance) { | ||
| /* Snap instance name is conveyed via untrusted environment. It may be | ||
| * unset (typically when experimenting with snap-confine by hand). It | ||
| * must also be a valid snap instance name. */ | ||
| if (snap_instance == NULL) { | ||
| die("cannot use NULL snap instance name"); | ||
| } | ||
| sc_instance_name_validate(snap_instance, NULL); | ||
|
|
||
| /* The security tag is conveyed via untrusted command line. It must be | ||
| * in agreement with snap instance name and must be a valid security | ||
| * tag. */ | ||
| const char *security_tag = sc_args_security_tag(args); | ||
| if (!verify_security_tag(security_tag, snap_instance)) { | ||
| die("security tag %s not allowed", security_tag); | ||
| } | ||
|
|
||
| /* The base snap name is conveyed via untrusted, optional, command line | ||
| * argument. It may be omitted where it implies the "core" snap is the | ||
| * base. */ | ||
| const char *base_snap_name = sc_args_base_snap(args); | ||
| if (base_snap_name == NULL) { | ||
| base_snap_name = "core"; | ||
| } | ||
| sc_snap_name_validate(base_snap_name, NULL); | ||
|
|
||
| /* The executable is conveyed via untrusted command line. It must be set | ||
| * but cannot be validated further than that at this time. It might be | ||
| * arguable to validate it to be snap-exec in one of the well-known | ||
| * locations or one of the special-cases like strace / gdb but this is | ||
| * not done at this time. */ | ||
| const char *executable = sc_args_executable(args); | ||
| if (executable == NULL) { | ||
| die("cannot run with NULL executable"); | ||
| } | ||
|
|
||
| /* Invocation helps to pass relevant data to various parts of snap-confine. */ | ||
| memset(inv, 0, sizeof *inv); | ||
| inv->base_snap_name = sc_strdup(base_snap_name); | ||
| inv->executable = sc_strdup(executable); | ||
| inv->security_tag = sc_strdup(security_tag); | ||
| inv->snap_instance = sc_strdup(snap_instance); | ||
| inv->classic_confinement = sc_args_is_classic_confinement(args); | ||
|
|
||
| debug("security tag: %s", inv->security_tag); | ||
| debug("executable: %s", inv->executable); | ||
| debug("confinement: %s", inv->classic_confinement ? "classic" : "non-classic"); | ||
| debug("base snap: %s", inv->base_snap_name); | ||
| } | ||
|
|
||
| void sc_cleanup_invocation(sc_invocation *inv) { | ||
| if (inv != NULL) { | ||
| sc_cleanup_string(&inv->snap_instance); | ||
| sc_cleanup_string(&inv->base_snap_name); | ||
| sc_cleanup_string(&inv->security_tag); | ||
| sc_cleanup_string(&inv->executable); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright (C) 2019 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef SC_SNAP_CONFINE_INVOCATION_H | ||
| #define SC_SNAP_CONFINE_INVOCATION_H | ||
|
|
||
| #include <stdbool.h> | ||
|
|
||
| #include "snap-confine-args.h" | ||
|
|
||
| /** | ||
| * sc_invocation contains information about how snap-confine was invoked. | ||
| * | ||
| * All of the pointer fields have the life-cycle bound to the main process. | ||
| **/ | ||
| typedef struct sc_invocation { | ||
| /* Things declared by the system. */ | ||
| char *snap_instance; | ||
| char *base_snap_name; | ||
| char *security_tag; | ||
| char *executable; | ||
| bool classic_confinement; | ||
| /* Things derived at runtime. */ | ||
| bool is_normal_mode; | ||
| } sc_invocation; | ||
|
|
||
| /** | ||
| * sc_init_invocation initializes the invocation object. | ||
| * | ||
| * Invocation is constructed based on command line arguments as well as | ||
| * environment value (SNAP_INSTANCE_NAME). All input is untrusted and is | ||
| * validated internally. | ||
| **/ | ||
| void sc_init_invocation(sc_invocation *inv, const struct sc_args *args, const char *snap_instance); | ||
|
|
||
| /** | ||
| * sc_cleanup_invocation is a cleanup function for sc_invocation. | ||
| * | ||
| * Cleanup functions are automatically called by the compiler whenever a | ||
| * variable gets out of scope, like C++ destructors would. | ||
| * | ||
| * This function is designed to be used with SC_CLEANUP(sc_cleanup_invocation). | ||
| **/ | ||
| void sc_cleanup_invocation(sc_invocation *inv); | ||
|
|
||
| #endif |
Oops, something went wrong.