Merge "services/identity: Some more temporary logging to help debug database wedges."
diff --git a/services/device/deviced/commands.go b/services/device/deviced/commands.go
index a9cb480..32a247a 100644
--- a/services/device/deviced/commands.go
+++ b/services/device/deviced/commands.go
@@ -13,6 +13,7 @@
"v.io/v23"
"v.io/x/lib/vlog"
"v.io/x/ref/services/device/internal/impl"
+ "v.io/x/ref/services/device/internal/installer"
)
var (
@@ -66,7 +67,7 @@
func runInstall(env *cmdline.Env, args []string) error {
if installFrom != "" {
// TODO(caprita): Also pass args into InstallFrom.
- if err := impl.InstallFrom(installFrom); err != nil {
+ if err := installer.InstallFrom(installFrom); err != nil {
vlog.Errorf("InstallFrom(%v) failed: %v", installFrom, err)
return err
}
@@ -81,7 +82,7 @@
if initMode && initHelper == "" {
return env.UsageErrorf("--init_helper must be set")
}
- if err := impl.SelfInstall(installationDir(env), suidHelper, agent, initHelper, origin, singleUser, sessionMode, initMode, args, os.Environ(), env.Stderr, env.Stdout); err != nil {
+ if err := installer.SelfInstall(installationDir(env), suidHelper, agent, initHelper, origin, singleUser, sessionMode, initMode, args, os.Environ(), env.Stderr, env.Stdout); err != nil {
vlog.Errorf("SelfInstall failed: %v", err)
return err
}
@@ -103,7 +104,7 @@
if suidHelper == "" {
return env.UsageErrorf("--suid_helper must be set")
}
- if err := impl.Uninstall(installationDir(env), suidHelper, env.Stderr, env.Stdout); err != nil {
+ if err := installer.Uninstall(installationDir(env), suidHelper, env.Stderr, env.Stdout); err != nil {
vlog.Errorf("Uninstall failed: %v", err)
return err
}
@@ -118,7 +119,7 @@
}
func runStart(env *cmdline.Env, _ []string) error {
- if err := impl.Start(installationDir(env), env.Stderr, env.Stdout); err != nil {
+ if err := installer.Start(installationDir(env), env.Stderr, env.Stdout); err != nil {
vlog.Errorf("Start failed: %v", err)
return err
}
@@ -135,7 +136,7 @@
func runStop(env *cmdline.Env, _ []string) error {
ctx, shutdown := v23.Init()
defer shutdown()
- if err := impl.Stop(ctx, installationDir(env), env.Stderr, env.Stdout); err != nil {
+ if err := installer.Stop(ctx, installationDir(env), env.Stderr, env.Stdout); err != nil {
vlog.Errorf("Stop failed: %v", err)
return err
}
diff --git a/services/device/internal/impl/app_service.go b/services/device/internal/impl/app_service.go
index e143a13..fabd4cd 100644
--- a/services/device/internal/impl/app_service.go
+++ b/services/device/internal/impl/app_service.go
@@ -414,10 +414,10 @@
return versionDir, verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("Symlink(%v, %v) failed: %v", oldVersionDir, previousLink, err))
}
}
- // updateLink should be the last thing we do, after we've ensured the
+ // UpdateLink should be the last thing we do, after we've ensured the
// new version is viable (currently, that just means it installs
// properly).
- return versionDir, updateLink(versionDir, filepath.Join(installationDir, "current"))
+ return versionDir, UpdateLink(versionDir, filepath.Join(installationDir, "current"))
}
func (i *appService) Install(ctx *context.T, call rpc.ServerCall, applicationVON string, config device.Config, packages application.Packages) (string, error) {
@@ -1158,7 +1158,7 @@
// Update to the newer version. Note, this is the only mutation
// performed to the instance, and, since it's atomic, the state of the
// instance is consistent at all times.
- return updateLink(latestVersionDir, versionLink)
+ return UpdateLink(latestVersionDir, versionLink)
}
func updateInstallation(ctx *context.T, installationDir string) error {
@@ -1249,7 +1249,7 @@
if err != nil {
return verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("EvalSymlinks(%v) failed: %v", previousLink, err))
}
- return updateLink(prevVersionDir, versionLink)
+ return UpdateLink(prevVersionDir, versionLink)
}
func revertInstallation(ctx *context.T, installationDir string) error {
@@ -1278,7 +1278,7 @@
if err != nil {
return verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("EvalSymlinks(%v) failed: %v", previousLink, err))
}
- return updateLink(prevVersionDir, currLink)
+ return UpdateLink(prevVersionDir, currLink)
}
func (i *appService) Revert(ctx *context.T, _ rpc.ServerCall) error {
diff --git a/services/device/internal/impl/device_service.go b/services/device/internal/impl/device_service.go
index 06b8e93..8b916f2 100644
--- a/services/device/internal/impl/device_service.go
+++ b/services/device/internal/impl/device_service.go
@@ -200,7 +200,7 @@
return nil
}
-func loadManagerInfo(dir string) (*ManagerInfo, error) {
+func LoadManagerInfo(dir string) (*ManagerInfo, error) {
infoPath := filepath.Join(dir, "info")
info := new(ManagerInfo)
if infoBytes, err := ioutil.ReadFile(infoPath); err != nil {
@@ -211,7 +211,7 @@
return info, nil
}
-func savePersistentArgs(root string, args []string) error {
+func SavePersistentArgs(root string, args []string) error {
dir := filepath.Join(root, "device-manager", "device-data")
if err := os.MkdirAll(dir, 0700); err != nil {
return fmt.Errorf("MkdirAll(%q) failed: %v", dir, err)
@@ -279,8 +279,8 @@
}
func (s *deviceService) revertDeviceManager(ctx *context.T) error {
- if err := updateLink(s.config.Previous, s.config.CurrentLink); err != nil {
- return verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("updateLink failed: %v", err))
+ if err := UpdateLink(s.config.Previous, s.config.CurrentLink); err != nil {
+ return verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("UpdateLink failed: %v", err))
}
if s.restartHandler != nil {
s.restartHandler()
@@ -441,7 +441,7 @@
// TODO(caprita): Move this to util.go since device_installer is also using it now.
-func generateScript(workspace string, configSettings []string, envelope *application.Envelope, logs string) error {
+func GenerateScript(workspace string, configSettings []string, envelope *application.Envelope, logs string) error {
// TODO(caprita): Remove this snippet of code, it doesn't seem to serve
// any purpose.
path, err := filepath.EvalSymlinks(os.Args[0])
@@ -456,7 +456,7 @@
output := "#!/bin/bash\n"
output += "if [ -z \"$DEVICE_MANAGER_DONT_REDIRECT_STDOUT_STDERR\" ]; then\n"
- output += fmt.Sprintf(" TIMESTAMP=$(%s)\n", dateCommand)
+ output += fmt.Sprintf(" TIMESTAMP=$(%s)\n", DateCommand)
output += fmt.Sprintf(" exec > %s-$TIMESTAMP 2> %s-$TIMESTAMP\n", stdoutLog, stderrLog)
output += " LOG_TO_STDERR=false\n"
output += "else\n"
@@ -519,7 +519,7 @@
// rather than binary object name.
sameBinary := s.config.Envelope != nil && envelope.Binary.File == s.config.Envelope.Binary.File
if sameBinary {
- if err := linkSelf(workspace, "deviced"); err != nil {
+ if err := LinkSelf(workspace, "deviced"); err != nil {
return err
}
} else {
@@ -535,7 +535,7 @@
}
logs := filepath.Join(s.config.Root, "device-manager", "logs")
- if err := generateScript(workspace, configSettings, envelope, logs); err != nil {
+ if err := GenerateScript(workspace, configSettings, envelope, logs); err != nil {
return err
}
@@ -543,7 +543,7 @@
return verror.New(errors.ErrOperationFailed, ctx, fmt.Sprintf("testDeviceManager failed: %v", err))
}
- if err := updateLink(filepath.Join(workspace, "deviced.sh"), s.config.CurrentLink); err != nil {
+ if err := UpdateLink(filepath.Join(workspace, "deviced.sh"), s.config.CurrentLink); err != nil {
return err
}
diff --git a/services/device/internal/impl/dispatcher.go b/services/device/internal/impl/dispatcher.go
index 21ebe01..2afb044 100644
--- a/services/device/internal/impl/dispatcher.go
+++ b/services/device/internal/impl/dispatcher.go
@@ -109,7 +109,7 @@
if err != nil {
return nil, verror.New(errCantCreateAccountStore, ctx, err)
}
- initSuidHelper(config.Helper)
+ InitSuidHelper(config.Helper)
d := &dispatcher{
internal: &internalState{
callback: newCallbackState(config.Name),
diff --git a/services/device/internal/impl/helper_manager.go b/services/device/internal/impl/helper_manager.go
index 3d24b16..b659375 100644
--- a/services/device/internal/impl/helper_manager.go
+++ b/services/device/internal/impl/helper_manager.go
@@ -26,7 +26,7 @@
var suidHelper *suidHelperState
-func initSuidHelper(helperPath string) {
+func InitSuidHelper(helperPath string) {
if suidHelper != nil || helperPath == "" {
return
}
@@ -53,6 +53,10 @@
return nil
}
+func DeleteFileTree(dirOrFile string, stdout, stderr io.Writer) error {
+ return suidHelper.deleteFileTree(dirOrFile, stdout, stderr)
+}
+
// deleteFileTree deletes a file or directory
func (s suidHelperState) deleteFileTree(dirOrFile string, stdout, stderr io.Writer) error {
if err := s.internalModalOp(stdout, stderr, "--rm", dirOrFile); err != nil {
diff --git a/services/device/internal/impl/impl_test.go b/services/device/internal/impl/impl_test.go
index c641600..081694e 100644
--- a/services/device/internal/impl/impl_test.go
+++ b/services/device/internal/impl/impl_test.go
@@ -26,6 +26,7 @@
"v.io/x/ref/services/device/internal/errors"
"v.io/x/ref/services/device/internal/impl"
"v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/internal/installer"
"v.io/x/ref/services/internal/binarylib"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test/expect"
@@ -314,7 +315,7 @@
dmDir := filepath.Join(testDir, "dm")
// TODO(caprita): Add test logic when initMode = true.
singleUser, sessionMode, initMode := true, true, false
- if err := impl.SelfInstall(dmDir, suidHelperPath, agentPath, initHelperPath, "", singleUser, sessionMode, initMode, dmargs[1:], dmenv, os.Stderr, os.Stdout); err != nil {
+ if err := installer.SelfInstall(dmDir, suidHelperPath, agentPath, initHelperPath, "", singleUser, sessionMode, initMode, dmargs[1:], dmenv, os.Stderr, os.Stdout); err != nil {
t.Fatalf("SelfInstall failed: %v", err)
}
@@ -323,7 +324,7 @@
stdout := make(simpleRW, 100)
defer os.Setenv(utiltest.RedirectEnv, os.Getenv(utiltest.RedirectEnv))
os.Setenv(utiltest.RedirectEnv, "1")
- if err := impl.Start(dmDir, os.Stderr, stdout); err != nil {
+ if err := installer.Start(dmDir, os.Stderr, stdout); err != nil {
t.Fatalf("Start failed: %v", err)
}
dms := expect.NewSession(t, stdout, servicetest.ExpectTimeout)
@@ -332,13 +333,13 @@
utiltest.RevertDeviceExpectError(t, ctx, "dm", errors.ErrUpdateNoOp.ID) // No previous version available.
// Stop the device manager.
- if err := impl.Stop(ctx, dmDir, os.Stderr, os.Stdout); err != nil {
+ if err := installer.Stop(ctx, dmDir, os.Stderr, os.Stdout); err != nil {
t.Fatalf("Stop failed: %v", err)
}
dms.Expect("dm terminated")
// Uninstall.
- if err := impl.Uninstall(dmDir, suidHelperPath, os.Stderr, os.Stdout); err != nil {
+ if err := installer.Uninstall(dmDir, suidHelperPath, os.Stderr, os.Stdout); err != nil {
t.Fatalf("Uninstall failed: %v", err)
}
// Ensure that the installation is gone.
diff --git a/services/device/internal/impl/shell_darwin.go b/services/device/internal/impl/shell_darwin.go
index 93c81ea..fc0d92a 100644
--- a/services/device/internal/impl/shell_darwin.go
+++ b/services/device/internal/impl/shell_darwin.go
@@ -5,5 +5,5 @@
package impl
const (
- dateCommand = "/bin/date +%s.$RANDOM"
+ DateCommand = "/bin/date +%s.$RANDOM"
)
diff --git a/services/device/internal/impl/shell_linux.go b/services/device/internal/impl/shell_linux.go
index 685a300..8e02672 100644
--- a/services/device/internal/impl/shell_linux.go
+++ b/services/device/internal/impl/shell_linux.go
@@ -5,5 +5,5 @@
package impl
const (
- dateCommand = "/bin/date +%s%N"
+ DateCommand = "/bin/date +%s%N"
)
diff --git a/services/device/internal/impl/util.go b/services/device/internal/impl/util.go
index bc97de3..3ba836e 100644
--- a/services/device/internal/impl/util.go
+++ b/services/device/internal/impl/util.go
@@ -12,6 +12,7 @@
"os/exec"
"path/filepath"
"reflect"
+ "regexp"
"strings"
"time"
@@ -125,8 +126,8 @@
return names, rejected
}
-// linkSelf creates a link to the current binary.
-func linkSelf(workspace, fileName string) error {
+// LinkSelf creates a link to the current binary.
+func LinkSelf(workspace, fileName string) error {
path := filepath.Join(workspace, fileName)
self := os.Args[0]
if err := os.Link(self, path); err != nil {
@@ -140,7 +141,7 @@
return time.Now().Format(time.RFC3339Nano)
}
-func updateLink(target, link string) error {
+func UpdateLink(target, link string) error {
newLink := link + ".new"
fi, err := os.Lstat(newLink)
if err == nil {
@@ -182,3 +183,31 @@
// tests. CleanupDir will use the helper to delete application state possibly
// owned by different accounts if helper is provided.
var CleanupDir = BaseCleanupDir
+
+// VanadiumEnvironment returns only the environment variables that are specific
+// to the Vanadium system.
+func VanadiumEnvironment(env []string) []string {
+ return filterEnvironment(env, allowedVarsRE, deniedVarsRE)
+}
+
+var allowedVarsRE = regexp.MustCompile("V23_.*|PAUSE_BEFORE_STOP|TMPDIR")
+
+var deniedVarsRE = regexp.MustCompile("V23_EXEC_VERSION")
+
+// filterEnvironment returns only the environment variables, specified by
+// the env parameter, whose names match the supplied regexp.
+func filterEnvironment(env []string, allow, deny *regexp.Regexp) []string {
+ var ret []string
+ for _, e := range env {
+ if eqIdx := strings.Index(e, "="); eqIdx > 0 {
+ key := e[:eqIdx]
+ if deny.MatchString(key) {
+ continue
+ }
+ if allow.MatchString(key) {
+ ret = append(ret, e)
+ }
+ }
+ }
+ return ret
+}
diff --git a/services/device/internal/impl/device_installer.go b/services/device/internal/installer/device_installer.go
similarity index 89%
rename from services/device/internal/impl/device_installer.go
rename to services/device/internal/installer/device_installer.go
index 030c0ea..4c1bb3c 100644
--- a/services/device/internal/impl/device_installer.go
+++ b/services/device/internal/installer/device_installer.go
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package impl
-
-// The device installer logic is responsible for managing the device manager
+// Package installer contains logic responsible for managing the device manager
// server, including setting it up / tearing it down, and starting / stopping
// it.
-//
+package installer
+
// When setting up the device manager installation, the installer creates a
// directory structure from which the device manager can be run. It sets up:
//
@@ -47,8 +46,6 @@
"os/exec"
"os/user"
"path/filepath"
- "regexp"
- "strings"
"syscall"
"time"
@@ -57,6 +54,7 @@
"v.io/v23/services/application"
"v.io/x/ref"
"v.io/x/ref/services/device/internal/config"
+ "v.io/x/ref/services/device/internal/impl"
"v.io/x/ref/services/device/internal/sysinit"
)
@@ -77,34 +75,6 @@
return nil
}
-var allowedVarsRE = regexp.MustCompile("V23_.*|PAUSE_BEFORE_STOP|TMPDIR")
-
-var deniedVarsRE = regexp.MustCompile("V23_EXEC_VERSION")
-
-// filterEnvironment returns only the environment variables, specified by
-// the env parameter, whose names match the supplied regexp.
-func filterEnvironment(env []string, allow, deny *regexp.Regexp) []string {
- var ret []string
- for _, e := range env {
- if eqIdx := strings.Index(e, "="); eqIdx > 0 {
- key := e[:eqIdx]
- if deny.MatchString(key) {
- continue
- }
- if allow.MatchString(key) {
- ret = append(ret, e)
- }
- }
- }
- return ret
-}
-
-// VanadiumEnvironment returns only the environment variables that are specific
-// to the Vanadium system.
-func VanadiumEnvironment(env []string) []string {
- return filterEnvironment(env, allowedVarsRE, deniedVarsRE)
-}
-
// initCommand verifies if init mode is enabled, and if so executes the
// appropriate sysinit command. Returns whether init mode was detected, as well
// as any error encountered.
@@ -147,7 +117,7 @@
}
// save info about the binary creating this tree
- if err := SaveCreatorInfo(root); err != nil {
+ if err := impl.SaveCreatorInfo(root); err != nil {
return err
}
@@ -175,12 +145,12 @@
// the garbage from the user's env.
// Alternatively, pass the env vars meant specifically for the
// device manager in a different way.
- Env: VanadiumEnvironment(env),
+ Env: impl.VanadiumEnvironment(env),
}
- if err := savePersistentArgs(root, envelope.Args); err != nil {
+ if err := impl.SavePersistentArgs(root, envelope.Args); err != nil {
return err
}
- if err := linkSelf(deviceDir, "deviced"); err != nil {
+ if err := impl.LinkSelf(deviceDir, "deviced"); err != nil {
return err
}
configSettings, err := configState.Save(nil)
@@ -188,12 +158,12 @@
return fmt.Errorf("failed to serialize config %v: %v", configState, err)
}
logs := filepath.Join(root, "device-manager", "logs")
- if err := generateScript(deviceDir, configSettings, envelope, logs); err != nil {
+ if err := impl.GenerateScript(deviceDir, configSettings, envelope, logs); err != nil {
return err
}
// TODO(caprita): Test the device manager we just installed.
- if err := updateLink(filepath.Join(deviceDir, "deviced.sh"), currLink); err != nil {
+ if err := impl.UpdateLink(filepath.Join(deviceDir, "deviced.sh"), currLink); err != nil {
return err
}
@@ -249,7 +219,7 @@
// TODO(caprita): Switch all our generated bash scripts to use templates.
output := "#!/bin/bash\n"
output += "if [ -z \"$DEVICE_MANAGER_DONT_REDIRECT_STDOUT_STDERR\" ]; then\n"
- output += fmt.Sprintf(" TIMESTAMP=$(%s)\n", dateCommand)
+ output += fmt.Sprintf(" TIMESTAMP=$(%s)\n", impl.DateCommand)
output += fmt.Sprintf(" exec > %s-$TIMESTAMP 2> %s-$TIMESTAMP\n", stdoutLog, stderrLog)
output += "fi\n"
output += fmt.Sprintf("%s=%q ", ref.EnvCredentials, principalDir)
@@ -284,8 +254,8 @@
return err
}
- initSuidHelper(helperPath)
- return suidHelper.deleteFileTree(root, stdout, stderr)
+ impl.InitSuidHelper(helperPath)
+ return impl.DeleteFileTree(root, stdout, stderr)
}
// Start starts the device manager.
@@ -320,10 +290,10 @@
fmt.Fprintf(stderr, "Unable to get a pid for successfully-started agent!")
return nil // We tolerate the error, at the expense of being able to stop later
}
- mi := &ManagerInfo{
+ mi := &impl.ManagerInfo{
Pid: cmd.Process.Pid,
}
- if err := SaveManagerInfo(filepath.Join(root, "agent-deviced"), mi); err != nil {
+ if err := impl.SaveManagerInfo(filepath.Join(root, "agent-deviced"), mi); err != nil {
return fmt.Errorf("failed to save info for agent-deviced: %v", err)
}
@@ -342,7 +312,7 @@
agentPid, devmgrPid := 0, 0
// Load the agent pid
- info, err := loadManagerInfo(filepath.Join(root, "agent-deviced"))
+ info, err := impl.LoadManagerInfo(filepath.Join(root, "agent-deviced"))
if err != nil {
return fmt.Errorf("loadManagerInfo failed for agent-deviced: %v", err)
}
@@ -351,7 +321,7 @@
}
// Load the device manager pid
- info, err = loadManagerInfo(filepath.Join(root, "device-manager"))
+ info, err = impl.LoadManagerInfo(filepath.Join(root, "device-manager"))
if err != nil {
return fmt.Errorf("loadManagerInfo failed for device-manager: %v", err)
}
diff --git a/services/groups/groupsd/main.go b/services/groups/groupsd/main.go
index 795d776..c485d85 100644
--- a/services/groups/groupsd/main.go
+++ b/services/groups/groupsd/main.go
@@ -10,23 +10,30 @@
// groupsd --v23.tcp.address="127.0.0.1:0" --name=groupsd
import (
- "flag"
+ "fmt"
"v.io/v23"
+ "v.io/v23/context"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/x/lib/vlog"
+ "v.io/x/lib/cmdline"
"v.io/x/ref/lib/security/securityflag"
"v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/v23cmd"
"v.io/x/ref/lib/xrpc"
_ "v.io/x/ref/runtime/factories/generic"
"v.io/x/ref/services/groups/internal/server"
"v.io/x/ref/services/groups/internal/store/memstore"
)
-var (
- name = flag.String("name", "", "Name to mount at.")
-)
+var flagName string
+
+func main() {
+ cmdGroupsD.Flags.StringVar(&flagName, "name", "", "Name to mount the groups server as.")
+
+ cmdline.HideGlobalFlagsExcept()
+ cmdline.Main(cmdGroupsD)
+}
// defaultPerms returns a permissions object that grants all permissions to the
// provided blessing patterns.
@@ -40,29 +47,35 @@
return perms
}
-// TODO(ashankar, jsimsa): Implement groupsd using the cmdline package.
-func main() {
- ctx, shutdown := v23.Init()
- defer shutdown()
+var cmdGroupsD = &cmdline.Command{
+ Runner: v23cmd.RunnerFunc(runGroupsD),
+ Name: "groupsd",
+ Short: "Runs the groups daemon.",
+ Long: `
+Command groupsd runs the groups daemon, which implements the
+v.io/v23/services/groups.Group interface.
+`,
+}
+func runGroupsD(ctx *context.T, env *cmdline.Env, args []string) error {
perms, err := securityflag.PermissionsFromFlag()
if err != nil {
- vlog.Fatal("securityflag.PermissionsFromFlag() failed: ", err)
+ return fmt.Errorf("PermissionsFromFlag() failed: %v", err)
}
-
if perms != nil {
- vlog.Info("Using permissions from command line flag.")
+ ctx.Infof("Using permissions from command line flag.")
} else {
- vlog.Info("No permissions flag provided. Giving local principal all permissions.")
+ ctx.Infof("No permissions flag provided. Giving local principal all permissions.")
perms = defaultPerms(security.DefaultBlessingPatterns(v23.GetPrincipal(ctx)))
}
-
m := server.NewManager(memstore.New(), perms)
- if _, err = xrpc.NewDispatchingServer(ctx, *name, m); err != nil {
- vlog.Fatal("NewDispatchingServer() failed: ", err)
+ server, err := xrpc.NewDispatchingServer(ctx, flagName, m)
+ if err != nil {
+ fmt.Errorf("NewDispatchingServer(%v) failed: %v", flagName, err)
}
- vlog.Info("Mounted at: ", *name)
+ ctx.Infof("Groups server running at endpoint=%q", server.Status().Endpoints[0].Name())
- // Wait forever.
+ // Wait until shutdown.
<-signals.ShutdownOnSignals(ctx)
+ return nil
}
