Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit splits out the varlink-specific parts into files appended with `_varlink` before the extension type. Fixes: gh#6286 Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
- Loading branch information
Showing
7 changed files
with
271 additions
and
30 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // +build linux | ||
| // +build varlink | ||
|
|
||
| package system | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/url" | ||
| "os" | ||
| "path/filepath" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/containers/libpod/cmd/podman/registry" | ||
| "github.com/containers/libpod/pkg/domain/entities" | ||
| "github.com/containers/libpod/pkg/rootless" | ||
| "github.com/containers/libpod/pkg/systemd" | ||
| "github.com/containers/libpod/pkg/util" | ||
| "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| var ( | ||
| srvDescription = `Run an API service | ||
| Enable a listening service for API access to Podman commands. | ||
| ` | ||
|
|
||
| srvCmd = &cobra.Command{ | ||
| Use: "service [flags] [URI]", | ||
| Args: cobra.MaximumNArgs(1), | ||
| Short: "Run API service", | ||
| Long: srvDescription, | ||
| RunE: service, | ||
| Example: `podman system service --time=0 unix:///tmp/podman.sock`, | ||
| } | ||
|
|
||
| srvArgs = struct { | ||
| Timeout int64 | ||
| Varlink bool | ||
| }{} | ||
| ) | ||
|
|
||
| func init() { | ||
| registry.Commands = append(registry.Commands, registry.CliCommand{ | ||
| Mode: []entities.EngineMode{entities.ABIMode}, | ||
| Command: srvCmd, | ||
| Parent: systemCmd, | ||
| }) | ||
|
|
||
| flags := srvCmd.Flags() | ||
| flags.Int64VarP(&srvArgs.Timeout, "time", "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout") | ||
| flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST") | ||
|
|
||
| _ = flags.MarkDeprecated("varlink", "valink API is deprecated.") | ||
| flags.SetNormalizeFunc(aliasTimeoutFlag) | ||
| } | ||
|
|
||
| func aliasTimeoutFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName { | ||
| if name == "timeout" { | ||
| name = "time" | ||
| } | ||
| return pflag.NormalizedName(name) | ||
| } | ||
|
|
||
| func service(cmd *cobra.Command, args []string) error { | ||
| apiURI, err := resolveApiURI(args) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| logrus.Infof("using API endpoint: '%s'", apiURI) | ||
|
|
||
| // Clean up any old existing unix domain socket | ||
| if len(apiURI) > 0 { | ||
| uri, err := url.Parse(apiURI) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer. | ||
| if "unix" == uri.Scheme && !registry.IsRemote() { | ||
| if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) { | ||
| return err | ||
| } | ||
| mask := syscall.Umask(0177) | ||
| defer syscall.Umask(mask) | ||
| } | ||
| } | ||
|
|
||
| opts := entities.ServiceOptions{ | ||
| URI: apiURI, | ||
| Timeout: time.Duration(srvArgs.Timeout) * time.Second, | ||
| Command: cmd, | ||
| } | ||
|
|
||
| if srvArgs.Varlink { | ||
| return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts) | ||
| } | ||
|
|
||
| logrus.Warn("This function is EXPERIMENTAL") | ||
| fmt.Fprintf(os.Stderr, "This function is EXPERIMENTAL.\n") | ||
|
|
||
| return restService(opts, cmd.Flags(), registry.PodmanConfig()) | ||
| } | ||
|
|
||
| func resolveApiURI(_url []string) (string, error) { | ||
| // When determining _*THE*_ listening endpoint -- | ||
| // 1) User input wins always | ||
| // 2) systemd socket activation | ||
| // 3) rootless honors XDG_RUNTIME_DIR | ||
| // 4) if varlink -- adapter.DefaultVarlinkAddress | ||
| // 5) lastly adapter.DefaultAPIAddress | ||
|
|
||
| if len(_url) == 0 { | ||
| if v, found := os.LookupEnv("PODMAN_SOCKET"); found { | ||
| logrus.Debugf("PODMAN_SOCKET='%s' used to determine API endpoint", v) | ||
| _url = []string{v} | ||
| } | ||
| } | ||
|
|
||
| switch { | ||
| case len(_url) > 0 && _url[0] != "": | ||
| return _url[0], nil | ||
| case systemd.SocketActivated(): | ||
| logrus.Info("using systemd socket activation to determine API endpoint") | ||
| return "", nil | ||
| case rootless.IsRootless(): | ||
| xdg, err := util.GetRuntimeDir() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| socketName := "podman.sock" | ||
| if srvArgs.Varlink { | ||
| socketName = "io.podman" | ||
| } | ||
| socketDir := filepath.Join(xdg, "podman", socketName) | ||
| if _, err := os.Stat(filepath.Dir(socketDir)); err != nil { | ||
| if os.IsNotExist(err) { | ||
| if err := os.Mkdir(filepath.Dir(socketDir), 0755); err != nil { | ||
| return "", err | ||
| } | ||
| } else { | ||
| return "", err | ||
| } | ||
| } | ||
| return "unix:" + socketDir, nil | ||
| case srvArgs.Varlink: | ||
| return registry.DefaultVarlinkAddress, nil | ||
| default: | ||
| return registry.DefaultRootAPIAddress, nil | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| // +build linux | ||
| // +build varlink | ||
|
|
||
| package system | ||
|
|
||
|
|
||
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
Oops, something went wrong.