diff --git a/build.go b/build.go
index d91ffc0..5955d95 100644
--- a/build.go
+++ b/build.go
@@ -20,10 +20,8 @@
package main
import (
- "bytes"
"log/slog"
"os"
- "os/exec"
"path/filepath"
"strings"
@@ -31,15 +29,13 @@ import (
"github.com/urfave/cli/v2"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
- "gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
- database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+ appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
- "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
)
func BuildCmd() *cli.Command {
@@ -74,53 +70,25 @@ func BuildCmd() *cli.Command {
if err != nil {
return cliutils.FormatCliExit(gotext.Get("Error getting working directory"), err)
}
- executable, err := os.Executable()
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error getting working directory"), err)
- }
- cmd := exec.Command(executable, "_internal-mount", wd)
- var stdout bytes.Buffer
- cmd.Stdout = &stdout
- cmd.Stderr = os.Stderr
- err = cmd.Run()
+ wd, cleanup, err := Mount(wd)
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error getting working directory"), err)
- }
-
- wd = stdout.String()
-
- defer func() {
- slog.Warn("unmounting...")
- cmd := exec.Command(executable, "_internal-umount", wd)
- var stdout bytes.Buffer
- cmd.Stdout = &stdout
- cmd.Stderr = os.Stderr
- err = cmd.Run()
- }()
-
- err = utils.DropCapsToAlrUser()
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error dropping capabilities"), err)
- }
- _, err = os.Stat(wd)
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error dropping capabilities"), err)
+ return err
}
+ defer cleanup()
ctx := c.Context
- cfg := config.New()
- err = cfg.Load()
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
- }
- db := database.New(cfg)
- rs := repos.New(cfg, db)
- err = db.Init(ctx)
+ deps, err := appbuilder.
+ New(ctx).
+ WithConfig().
+ WithDB().
+ WithReposNoPull().
+ Build()
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
+ return cli.Exit(err, 1)
}
+ defer deps.Defer()
var script string
var packages []string
@@ -137,10 +105,17 @@ func BuildCmd() *cli.Command {
return cliutils.FormatCliExit(gotext.Get("Error parsing os release"), err)
}
- builder := build.NewMainBuilder(
- cfg,
- rs,
+ if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil {
+ return err
+ }
+
+ builder, err := build.NewMainBuilder(
+ deps.Cfg,
+ deps.Repos,
)
+ if err != nil {
+ return err
+ }
var res *build.BuildResult
@@ -179,7 +154,7 @@ func BuildCmd() *cli.Command {
packageSearch = arr[0]
}
- pkgs, _, _ := rs.FindPkgs(ctx, []string{packageSearch})
+ pkgs, _, _ := deps.Repos.FindPkgs(ctx, []string{packageSearch})
pkg, ok := pkgs[packageSearch]
if len(pkg) < 1 || !ok {
slog.Error(gotext.Get("Package not found"))
diff --git a/go.mod b/go.mod
index eea725d..6438685 100644
--- a/go.mod
+++ b/go.mod
@@ -4,8 +4,6 @@ go 1.22
toolchain go1.23.5
-replace github.com/creack/pty => github.com/creack/pty v1.1.19
-
require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/PuerkitoBio/purell v1.2.0
@@ -16,7 +14,6 @@ require (
github.com/charmbracelet/bubbletea v1.2.4
github.com/charmbracelet/lipgloss v1.0.0
github.com/charmbracelet/log v0.4.0
- github.com/creack/pty v1.1.24
github.com/efficientgo/e2e v0.14.1-0.20240418111536-97db25a0c6c0
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-git/go-git/v5 v5.12.0
@@ -68,6 +65,7 @@ require (
github.com/cloudflare/circl v1.3.8 // indirect
github.com/connesc/cipherio v0.2.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+ github.com/creack/pty v1.1.24 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect
diff --git a/go.sum b/go.sum
index 7789727..c738cd0 100644
--- a/go.sum
+++ b/go.sum
@@ -106,8 +106,9 @@ github.com/connesc/cipherio v0.2.1 h1:FGtpTPMbKNNWByNrr9aEBtaJtXjqOzkIXNYJp6OEyc
github.com/connesc/cipherio v0.2.1/go.mod h1:ukY0MWJDFnJEbXMQtOcn2VmTpRfzcTz4OoVrWGGJZcA=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.19 h1:tUN6H7LWqNx4hQVxomd0CVsDwaDr9gaRQaI4GpSmrsA=
-github.com/creack/pty v1.1.19/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/install.go b/install.go
index 47d3e75..ece2eaf 100644
--- a/install.go
+++ b/install.go
@@ -21,22 +21,18 @@ package main
import (
"fmt"
- "log/slog"
- "os"
"github.com/leonelquinteros/gotext"
"github.com/urfave/cli/v2"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
- "gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
- "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
)
func InstallCmd() *cli.Command {
@@ -52,50 +48,51 @@ func InstallCmd() *cli.Command {
},
},
Action: func(c *cli.Context) error {
+ if err := utils.ExitIfNotRoot(); err != nil {
+ return err
+ }
+
ctx := c.Context
args := c.Args()
if args.Len() < 1 {
- slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len()))
- os.Exit(1)
+ return cliutils.FormatCliExit(gotext.Get("Command install expected at least 1 argument, got %d", args.Len()), nil)
}
mgr := manager.Detect()
if mgr == nil {
- slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
- os.Exit(1)
+ return cliutils.FormatCliExit(gotext.Get("Unable to detect a supported package manager on the system"), nil)
}
- cfg := config.New()
- err := cfg.Load()
+ deps, err := appbuilder.
+ New(ctx).
+ WithConfig().
+ WithDB().
+ WithReposNoPull().
+ Build()
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
+ return err
}
+ defer deps.Defer()
- db := database.New(cfg)
- rs := repos.New(cfg, db)
- err = db.Init(ctx)
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
- }
-
- err = utils.DropCapsToAlrUser()
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error dropping capabilities"), err)
- }
-
- builder := build.NewMainBuilder(
- cfg,
- rs,
+ builder, err := build.NewMainBuilder(
+ deps.Cfg,
+ deps.Repos,
)
+ if err != nil {
+ return err
+ }
- if cfg.AutoPull() {
- err := rs.Pull(ctx, cfg.Repos())
- if err != nil {
+ if deps.Cfg.AutoPull() {
+ if err := deps.Repos.Pull(ctx, deps.Cfg.Repos()); err != nil {
return cliutils.FormatCliExit(gotext.Get("Error pulling repositories"), err)
}
}
+ if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil {
+ return err
+ }
+
info, err := distro.ParseOSRelease(ctx)
if err != nil {
return cliutils.FormatCliExit(gotext.Get("Error parsing os release"), err)
@@ -120,18 +117,22 @@ func InstallCmd() *cli.Command {
return nil
},
BashComplete: cliutils.BashCompleteWithError(func(c *cli.Context) error {
- cfg := config.New()
- err := cfg.Load()
- if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
+ if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil {
+ return err
}
- db := database.New(cfg)
- err = db.Init(c.Context)
+ ctx := c.Context
+ deps, err := appbuilder.
+ New(ctx).
+ WithConfig().
+ WithDB().
+ Build()
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
+ return err
}
- result, err := db.GetPkgs(c.Context, "true")
+ defer deps.Defer()
+
+ result, err := deps.DB.GetPkgs(c.Context, "true")
if err != nil {
return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
}
@@ -173,8 +174,7 @@ func RemoveCmd() *cli.Command {
installedAlrPackages := map[string]string{}
mgr := manager.Detect()
if mgr == nil {
- slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
- os.Exit(1)
+ return cliutils.FormatCliExit(gotext.Get("Unable to detect a supported package manager on the system"), nil)
}
installed, err := mgr.ListInstalled(&manager.Opts{AsRoot: false})
if err != nil {
diff --git a/internal.go b/internal.go
index 8282be1..7546d87 100644
--- a/internal.go
+++ b/internal.go
@@ -17,13 +17,14 @@
package main
import (
+ "bufio"
+ "errors"
"fmt"
"log/slog"
"os"
"os/exec"
"os/user"
"path/filepath"
- "strings"
"syscall"
"github.com/hashicorp/go-hclog"
@@ -32,13 +33,13 @@ import (
"github.com/urfave/cli/v2"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
+ appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
- database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+ "gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
- "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
)
func InternalBuildCmd() *cli.Command {
@@ -48,13 +49,15 @@ func InternalBuildCmd() *cli.Command {
Hidden: true,
Action: func(c *cli.Context) error {
logger.SetupForGoPlugin()
- err := utils.DropCapsToAlrUser()
- if err != nil {
- slog.Error("aa", "err", err)
- os.Exit(1)
+
+ slog.Debug("start _internal-safe-script-executor", "uid", syscall.Getuid(), "gid", syscall.Getgid())
+
+ if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil {
+ return err
}
+
cfg := config.New()
- err = cfg.Load()
+ err := cfg.Load()
if err != nil {
return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
}
@@ -66,6 +69,7 @@ func InternalBuildCmd() *cli.Command {
JSONFormat: false,
DisableTime: true,
})
+
plugin.Serve(&plugin.ServeConfig{
HandshakeConfig: build.HandshakeConfig,
Plugins: map[string]plugin.Plugin{
@@ -87,24 +91,28 @@ func InternalInstallCmd() *cli.Command {
Hidden: true,
Action: func(c *cli.Context) error {
logger.SetupForGoPlugin()
- err := syscall.Setuid(0)
- if err != nil {
- slog.Error("err")
- os.Exit(1)
+
+ if err := utils.EnuseIsAlrUser(); err != nil {
+ return err
}
- cfg := config.New()
- err = cfg.Load()
+ // Before escalating the rights, we made sure that
+ // this is an ALR user, so it looks safe.
+ err := utils.EscalateToRootUid()
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
+ return cliutils.FormatCliExit("cannot escalate to root", err)
}
- db := database.New(cfg)
- rs := repos.New(cfg, db)
- err = db.Init(c.Context)
+ deps, err := appbuilder.
+ New(c.Context).
+ WithConfig().
+ WithDB().
+ WithReposNoPull().
+ Build()
if err != nil {
- return cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
+ return err
}
+ defer deps.Defer()
logger := hclog.New(&hclog.LoggerOptions{
Name: "plugin",
@@ -119,7 +127,7 @@ func InternalInstallCmd() *cli.Command {
Plugins: map[string]plugin.Plugin{
"installer": &build.InstallerPlugin{
Impl: build.NewInstaller(
- rs,
+ deps.Repos,
manager.Detect(),
),
},
@@ -131,52 +139,100 @@ func InternalInstallCmd() *cli.Command {
}
}
+func Mount(target string) (string, func(), error) {
+ exe, err := os.Executable()
+ if err != nil {
+ return "", nil, fmt.Errorf("failed to get executable path: %w", err)
+ }
+
+ cmd := exec.Command(exe, "_internal-temporary-mount", target)
+
+ stdoutPipe, err := cmd.StdoutPipe()
+ if err != nil {
+ return "", nil, fmt.Errorf("failed to get stdout pipe: %w", err)
+ }
+
+ stdinPipe, err := cmd.StdinPipe()
+ if err != nil {
+ return "", nil, fmt.Errorf("failed to get stdin pipe: %w", err)
+ }
+
+ cmd.Stderr = os.Stderr
+
+ if err := cmd.Start(); err != nil {
+ return "", nil, fmt.Errorf("failed to start mount: %w", err)
+ }
+
+ scanner := bufio.NewScanner(stdoutPipe)
+ var mountPath string
+ if scanner.Scan() {
+ mountPath = scanner.Text()
+ }
+
+ if err := scanner.Err(); err != nil {
+ _ = cmd.Process.Kill()
+ return "", nil, fmt.Errorf("failed to read mount output: %w", err)
+ }
+
+ if mountPath == "" {
+ _ = cmd.Process.Kill()
+ return "", nil, errors.New("mount failed: no target path returned")
+ }
+
+ cleanup := func() {
+ slog.Debug("cleanup triggered")
+ _, _ = fmt.Fprintln(stdinPipe, "")
+ _ = cmd.Wait()
+ }
+
+ return mountPath, cleanup, nil
+}
+
func InternalMountCmd() *cli.Command {
return &cli.Command{
- Name: "_internal-mount",
+ Name: "_internal-temporary-mount",
HideHelp: true,
Hidden: true,
Action: func(c *cli.Context) error {
+ logger.SetupForGoPlugin()
+
sourceDir := c.Args().First()
u, _ := user.Current()
+ _, alrGid, _ := utils.GetUidGidAlrUser()
- logger.SetupForGoPlugin()
- err := syscall.Setuid(0)
- if err != nil {
- slog.Error("Failed to setuid(0)", "err", err)
- os.Exit(1)
+ if err := utils.EnuseIsWheelMember(); err != nil {
+ return err
}
- alrRunDir := "/var/run/alr"
- err = os.MkdirAll(alrRunDir, 0o750)
- if err != nil {
- slog.Error("Error creating /var/run/alr directory", "err", err)
- os.Exit(1)
+ // Before escalating the rights, we made sure that
+ // 1. user in wheel group
+ // 2. user can access sourceDir
+ if err := utils.EscalateToRootUid(); err != nil {
+ return err
+ }
+ if err := syscall.Setgid(alrGid); err != nil {
+ return err
}
- _, gid, _ := utils.GetUidGidAlrUser()
-
- // Меняем группу на alr и права
- err = os.Chown(alrRunDir, 0, gid) // root:alr
- if err != nil {
- slog.Error("Failed to chown /var/run/alr", "err", err)
- os.Exit(1)
+ if err := os.MkdirAll(constants.AlrRunDir, 0o770); err != nil {
+ return cliutils.FormatCliExit(fmt.Sprintf("failed to create %s", constants.AlrRunDir), err)
}
- // Создаем поддиректорию для bindfs
- targetDir := filepath.Join(alrRunDir, fmt.Sprintf("bindfs-%d", os.Getpid()))
- err = os.MkdirAll(targetDir, 0o750) // 0750: владелец (root) и группа (alr) имеют доступ
- if err != nil {
- slog.Error("Error creating bindfs target directory", "err", err)
- os.Exit(1)
+ if err := os.Chown(constants.AlrRunDir, 0, alrGid); err != nil {
+ return cliutils.FormatCliExit(fmt.Sprintf("failed to chown %s", constants.AlrRunDir), err)
}
- // Устанавливаем владельца и группу (root:alr)
- err = os.Chown(targetDir, 0, gid)
- if err != nil {
- slog.Error("Failed to chown bindfs directory", "err", err)
- os.Exit(1)
+ targetDir := filepath.Join(constants.AlrRunDir, fmt.Sprintf("bindfs-%d", os.Getpid()))
+ // 0750: owner (root) and group (alr)
+ if err := os.MkdirAll(targetDir, 0o750); err != nil {
+ return cliutils.FormatCliExit("error creating bindfs target directory", err)
+ }
+
+ // chown AlrRunDir/mounts/bindfs-* to (root:alr),
+ // so alr user can access dir
+ if err := os.Chown(targetDir, 0, alrGid); err != nil {
+ return cliutils.FormatCliExit("failed to chown bindfs directory", err)
}
bindfsCmd := exec.Command(
@@ -188,74 +244,24 @@ func InternalMountCmd() *cli.Command {
bindfsCmd.Stderr = os.Stderr
- if err := bindfsCmd.Start(); err != nil {
- slog.Error("Error starting bindfs", "err", err)
- os.Exit(1)
+ if err := bindfsCmd.Run(); err != nil {
+ return cliutils.FormatCliExit("failed to strart bindfs", err)
}
- fmt.Print(targetDir)
+ fmt.Println(targetDir)
- return nil
- },
- }
-}
+ _, _ = bufio.NewReader(os.Stdin).ReadString('\n')
-func InternalUnmountCmd() *cli.Command {
- return &cli.Command{
- Name: "_internal-umount",
- HideHelp: true,
- Hidden: true,
- Action: func(c *cli.Context) error {
- currentUser, err := user.Current()
- if err != nil {
- slog.Error("Failed to get current user", "err", err)
- os.Exit(1)
- }
-
- uid, gid, err := utils.GetUidGidAlrUserString()
- if err != nil {
- slog.Error("Failed to get alr user info", "err", err)
- os.Exit(1)
- }
-
- if currentUser.Uid != uid && currentUser.Gid != gid {
- slog.Error("Only alr user can unmount these directories")
- os.Exit(1)
- }
-
- targetDir := c.Args().First()
- if targetDir == "" {
- slog.Error("No target directory specified")
- os.Exit(1)
- }
-
- if !strings.HasPrefix(targetDir, "/var/run/alr/") {
- slog.Error("Can only unmount directories under /var/run/alr")
- os.Exit(1)
- }
-
- if _, err := os.Stat(targetDir); os.IsNotExist(err) {
- slog.Error("Target directory does not exist", "dir", targetDir)
- os.Exit(1)
- }
-
- err = syscall.Setuid(0)
- if err != nil {
- slog.Error("Failed to setuid(0)", "err", err)
- os.Exit(1)
- }
+ slog.Debug("start unmount", "dir", targetDir)
umountCmd := exec.Command("umount", targetDir)
umountCmd.Stderr = os.Stderr
-
if err := umountCmd.Run(); err != nil {
- slog.Error("Error unmounting directory", "dir", targetDir, "err", err)
- os.Exit(1)
+ return cliutils.FormatCliExit(fmt.Sprintf("failed to unmount %s", targetDir), err)
}
if err := os.Remove(targetDir); err != nil {
- slog.Error("Error removing directory", "dir", targetDir, "err", err)
- os.Exit(1)
+ return cliutils.FormatCliExit(fmt.Sprintf("error removing directory %s", targetDir), err)
}
return nil
diff --git a/internal/cliutils/app_builder/builder.go b/internal/cliutils/app_builder/builder.go
index a32e241..d45386b 100644
--- a/internal/cliutils/app_builder/builder.go
+++ b/internal/cliutils/app_builder/builder.go
@@ -22,8 +22,8 @@ import (
"log/slog"
"github.com/leonelquinteros/gotext"
- "github.com/urfave/cli/v2"
+ "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
@@ -68,8 +68,7 @@ func (b *AppBuilder) WithConfig() *AppBuilder {
cfg := config.New()
if err := cfg.Load(); err != nil {
- slog.Error(gotext.Get("Error loading config"), "err", err)
- b.err = cli.Exit("", 1)
+ b.err = cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
return b
}
@@ -90,8 +89,7 @@ func (b *AppBuilder) WithDB() *AppBuilder {
db := db.New(cfg)
if err := db.Init(b.ctx); err != nil {
- slog.Error(gotext.Get("Error initialization database"), "err", err)
- b.err = cli.Exit("", 1)
+ b.err = cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
return b
}
@@ -130,8 +128,7 @@ func (b *AppBuilder) withRepos(enablePull, forcePull bool) *AppBuilder {
if enablePull && (forcePull || cfg.AutoPull()) {
if err := rs.Pull(b.ctx, cfg.Repos()); err != nil {
- slog.Error(gotext.Get("Error pulling repositories"), "err", err)
- b.err = cli.Exit("", 1)
+ b.err = cliutils.FormatCliExit(gotext.Get("Error pulling repositories"), err)
return b
}
}
diff --git a/internal/config/config.go b/internal/config/config.go
index b60962b..5e94080 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -28,6 +28,7 @@ import (
"github.com/caarlos0/env"
"github.com/pelletier/go-toml/v2"
+ "gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
)
@@ -83,14 +84,9 @@ func mergeStructs(dst, src interface{}) {
}
}
-const (
- systemConfigPath = "/etc/alr/alr.toml"
- systemCachePath = "/var/cache/alr"
-)
-
func (c *ALRConfig) Load() error {
systemConfig, err := readConfig(
- systemConfigPath,
+ constants.SystemConfigPath,
)
if err != nil {
slog.Debug("Cannot read system config", "err", err)
@@ -108,8 +104,8 @@ func (c *ALRConfig) Load() error {
c.cfg = config
c.paths = &Paths{}
- c.paths.UserConfigPath = systemConfigPath
- c.paths.CacheDir = systemCachePath
+ c.paths.UserConfigPath = constants.SystemConfigPath
+ c.paths.CacheDir = constants.SystemCachePath
c.paths.RepoDir = filepath.Join(c.paths.CacheDir, "repo")
c.paths.PkgsDir = filepath.Join(c.paths.CacheDir, "pkgs")
c.paths.DBPath = filepath.Join(c.paths.CacheDir, "db")
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
new file mode 100644
index 0000000..0ab0bfc
--- /dev/null
+++ b/internal/constants/constants.go
@@ -0,0 +1,23 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// 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 .
+
+package constants
+
+const (
+ SystemConfigPath = "/etc/alr/alr.toml"
+ SystemCachePath = "/var/cache/alr"
+ AlrRunDir = "/var/run/alr"
+)
diff --git a/internal/translations/default.pot b/internal/translations/default.pot
index 4acc4c3..a94ccb8 100644
--- a/internal/translations/default.pot
+++ b/internal/translations/default.pot
@@ -9,64 +9,52 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: build.go:48
+#: build.go:44
msgid "Build a local package"
msgstr ""
-#: build.go:54
+#: build.go:50
msgid "Path to the build script"
msgstr ""
-#: build.go:59
+#: build.go:55
msgid "Specify subpackage in script (for multi package script only)"
msgstr ""
-#: build.go:64
+#: build.go:60
msgid "Name of the package to build and its repo (example: default/go-bin)"
msgstr ""
-#: build.go:69
+#: build.go:65
msgid ""
"Build package from scratch even if there's an already built package available"
msgstr ""
-#: build.go:75 build.go:79 build.go:88
+#: build.go:71
msgid "Error getting working directory"
msgstr ""
-#: build.go:104 build.go:108
-msgid "Error dropping capabilities"
-msgstr ""
-
-#: build.go:115
-msgid "Error loading config"
-msgstr ""
-
-#: build.go:122
-msgid "Error initialization database"
-msgstr ""
-
-#: build.go:131
+#: build.go:99
msgid "Unable to detect a supported package manager on the system"
msgstr ""
-#: build.go:137
+#: build.go:105
msgid "Error parsing os release"
msgstr ""
-#: build.go:168 build.go:209
+#: build.go:143 build.go:184
msgid "Error building package"
msgstr ""
-#: build.go:185
+#: build.go:160
msgid "Package not found"
msgstr ""
-#: build.go:212
+#: build.go:187
msgid "Nothing to build"
msgstr ""
-#: build.go:221
+#: build.go:196
msgid "Error moving the package"
msgstr ""
@@ -166,7 +154,7 @@ msgstr ""
msgid "Error encoding script variables"
msgstr ""
-#: install.go:45
+#: install.go:41
msgid "Install a new package"
msgstr ""
@@ -174,11 +162,11 @@ msgstr ""
msgid "Command install expected at least 1 argument, got %d"
msgstr ""
-#: install.go:95
+#: install.go:88
msgid "Error pulling repositories"
msgstr ""
-#: install.go:158
+#: install.go:159
msgid "Remove an installed package"
msgstr ""
@@ -194,6 +182,14 @@ msgstr ""
msgid "Error removing packages"
msgstr ""
+#: internal/cliutils/app_builder/builder.go:71
+msgid "Error loading config"
+msgstr ""
+
+#: internal/cliutils/app_builder/builder.go:92
+msgid "Error initialization database"
+msgstr ""
+
#: internal/cliutils/prompt.go:60
msgid "Would you like to view the build script for %s"
msgstr ""
@@ -311,7 +307,11 @@ msgstr ""
msgid "ERROR"
msgstr ""
-#: internal/utils/cmd.go:94
+#: internal/utils/cmd.go:86
+msgid "Error dropping capabilities"
+msgstr ""
+
+#: internal/utils/cmd.go:93
msgid "You need to be root to perform this action"
msgstr ""
@@ -331,27 +331,27 @@ msgstr ""
msgid "Enable interactive questions and prompts"
msgstr ""
-#: main.go:148
+#: main.go:147
msgid "Show help"
msgstr ""
-#: main.go:152
+#: main.go:151
msgid "Error while running app"
msgstr ""
-#: pkg/build/build.go:392
+#: pkg/build/build.go:394
msgid "Building package"
msgstr ""
-#: pkg/build/build.go:421
+#: pkg/build/build.go:423
msgid "The checksums array must be the same length as sources"
msgstr ""
-#: pkg/build/build.go:448
+#: pkg/build/build.go:454
msgid "Downloading sources"
msgstr ""
-#: pkg/build/build.go:535
+#: pkg/build/build.go:543
msgid "Installing dependencies"
msgstr ""
@@ -419,47 +419,47 @@ msgid ""
"updating ALR if something doesn't work."
msgstr ""
-#: repo.go:40
+#: repo.go:39
msgid "Add a new repository"
msgstr ""
-#: repo.go:47
+#: repo.go:46
msgid "Name of the new repo"
msgstr ""
-#: repo.go:53
+#: repo.go:52
msgid "URL of the new repo"
msgstr ""
-#: repo.go:80
+#: repo.go:79
msgid "Repo %s already exists"
msgstr ""
-#: repo.go:91 repo.go:169
+#: repo.go:90 repo.go:167
msgid "Error saving config"
msgstr ""
-#: repo.go:117
+#: repo.go:116
msgid "Remove an existing repository"
msgstr ""
-#: repo.go:124
+#: repo.go:123
msgid "Name of the repo to be deleted"
msgstr ""
-#: repo.go:157
-msgid "Repo does not exist"
+#: repo.go:156
+msgid "Repo \"%s\" does not exist"
msgstr ""
-#: repo.go:165
+#: repo.go:163
msgid "Error removing repo directory"
msgstr ""
-#: repo.go:188
+#: repo.go:186
msgid "Error removing packages from database"
msgstr ""
-#: repo.go:199
+#: repo.go:197
msgid "Pull all repositories that have changed"
msgstr ""
@@ -503,14 +503,14 @@ msgstr ""
msgid "Upgrade all installed packages"
msgstr ""
-#: upgrade.go:101
+#: upgrade.go:103
msgid "Error pulling repos"
msgstr ""
-#: upgrade.go:107 upgrade.go:124
+#: upgrade.go:109 upgrade.go:126
msgid "Error checking for updates"
msgstr ""
-#: upgrade.go:127
+#: upgrade.go:129
msgid "There is nothing to do."
msgstr ""
diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po
index 6661d8f..16287b5 100644
--- a/internal/translations/po/ru/default.po
+++ b/internal/translations/po/ru/default.po
@@ -16,67 +16,53 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Gtranslator 47.1\n"
-#: build.go:48
+#: build.go:44
msgid "Build a local package"
msgstr "Сборка локального пакета"
-#: build.go:54
+#: build.go:50
msgid "Path to the build script"
msgstr "Путь к скрипту сборки"
-#: build.go:59
+#: build.go:55
msgid "Specify subpackage in script (for multi package script only)"
msgstr "Укажите подпакет в скрипте (только для многопакетного скрипта)"
-#: build.go:64
+#: build.go:60
msgid "Name of the package to build and its repo (example: default/go-bin)"
msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
-#: build.go:69
+#: build.go:65
msgid ""
"Build package from scratch even if there's an already built package available"
msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
-#: build.go:75 build.go:79 build.go:88
+#: build.go:71
msgid "Error getting working directory"
msgstr "Ошибка при получении рабочего каталога"
-#: build.go:104 build.go:108
-#, fuzzy
-msgid "Error dropping capabilities"
-msgstr "Ошибка при открытии базы данных"
-
-#: build.go:115
-#, fuzzy
-msgid "Error loading config"
-msgstr "Ошибка при кодировании конфигурации"
-
-#: build.go:122
-msgid "Error initialization database"
-msgstr "Ошибка инициализации базы данных"
-
-#: build.go:131
+#: build.go:99
msgid "Unable to detect a supported package manager on the system"
msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
-#: build.go:137
+#: build.go:105
msgid "Error parsing os release"
msgstr "Ошибка при разборе файла выпуска операционной системы"
-#: build.go:168 build.go:209
+#: build.go:143 build.go:184
msgid "Error building package"
msgstr "Ошибка при сборке пакета"
-#: build.go:185
+#: build.go:160
msgid "Package not found"
msgstr "Пакет не найден"
-#: build.go:212
+#: build.go:187
#, fuzzy
msgid "Nothing to build"
msgstr "Исполнение build()"
-#: build.go:221
+#: build.go:196
msgid "Error moving the package"
msgstr "Ошибка при перемещении пакета"
@@ -181,7 +167,7 @@ msgstr "Ошибка устранения переорпеделений"
msgid "Error encoding script variables"
msgstr "Ошибка кодирования переменных скрита"
-#: install.go:45
+#: install.go:41
msgid "Install a new package"
msgstr "Установить новый пакет"
@@ -189,11 +175,11 @@ msgstr "Установить новый пакет"
msgid "Command install expected at least 1 argument, got %d"
msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
-#: install.go:95
+#: install.go:88
msgid "Error pulling repositories"
msgstr "Ошибка при извлечении репозиториев"
-#: install.go:158
+#: install.go:159
msgid "Remove an installed package"
msgstr "Удалить установленный пакет"
@@ -209,6 +195,15 @@ msgstr "Для команды remove ожидался хотя бы 1 аргум
msgid "Error removing packages"
msgstr "Ошибка при удалении пакетов"
+#: internal/cliutils/app_builder/builder.go:71
+#, fuzzy
+msgid "Error loading config"
+msgstr "Ошибка при кодировании конфигурации"
+
+#: internal/cliutils/app_builder/builder.go:92
+msgid "Error initialization database"
+msgstr "Ошибка инициализации базы данных"
+
#: internal/cliutils/prompt.go:60
msgid "Would you like to view the build script for %s"
msgstr "Показать скрипт для пакета %s"
@@ -327,7 +322,12 @@ msgstr "%s %s загружается — %s/с\n"
msgid "ERROR"
msgstr "ОШИБКА"
-#: internal/utils/cmd.go:94
+#: internal/utils/cmd.go:86
+#, fuzzy
+msgid "Error dropping capabilities"
+msgstr "Ошибка при открытии базы данных"
+
+#: internal/utils/cmd.go:93
msgid "You need to be root to perform this action"
msgstr ""
@@ -347,27 +347,27 @@ msgstr "Аргументы, которые будут переданы мене
msgid "Enable interactive questions and prompts"
msgstr "Включение интерактивных вопросов и запросов"
-#: main.go:148
+#: main.go:147
msgid "Show help"
msgstr "Показать справку"
-#: main.go:152
+#: main.go:151
msgid "Error while running app"
msgstr "Ошибка при запуске приложения"
-#: pkg/build/build.go:392
+#: pkg/build/build.go:394
msgid "Building package"
msgstr "Сборка пакета"
-#: pkg/build/build.go:421
+#: pkg/build/build.go:423
msgid "The checksums array must be the same length as sources"
msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
-#: pkg/build/build.go:448
+#: pkg/build/build.go:454
msgid "Downloading sources"
msgstr "Скачивание источников"
-#: pkg/build/build.go:535
+#: pkg/build/build.go:543
msgid "Installing dependencies"
msgstr "Установка зависимостей"
@@ -441,49 +441,50 @@ msgstr ""
"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
"обновить ALR, если что-то не работает."
-#: repo.go:40
+#: repo.go:39
msgid "Add a new repository"
msgstr "Добавить новый репозиторий"
-#: repo.go:47
+#: repo.go:46
msgid "Name of the new repo"
msgstr "Название нового репозитория"
-#: repo.go:53
+#: repo.go:52
msgid "URL of the new repo"
msgstr "URL-адрес нового репозитория"
-#: repo.go:80
+#: repo.go:79
#, fuzzy
msgid "Repo %s already exists"
msgstr "Репозитория не существует"
-#: repo.go:91 repo.go:169
+#: repo.go:90 repo.go:167
#, fuzzy
msgid "Error saving config"
msgstr "Ошибка при кодировании конфигурации"
-#: repo.go:117
+#: repo.go:116
msgid "Remove an existing repository"
msgstr "Удалить существующий репозиторий"
-#: repo.go:124
+#: repo.go:123
msgid "Name of the repo to be deleted"
msgstr "Название репозитория удалён"
-#: repo.go:157
-msgid "Repo does not exist"
+#: repo.go:156
+#, fuzzy
+msgid "Repo \"%s\" does not exist"
msgstr "Репозитория не существует"
-#: repo.go:165
+#: repo.go:163
msgid "Error removing repo directory"
msgstr "Ошибка при удалении каталога репозитория"
-#: repo.go:188
+#: repo.go:186
msgid "Error removing packages from database"
msgstr "Ошибка при удалении пакетов из базы данных"
-#: repo.go:199
+#: repo.go:197
msgid "Pull all repositories that have changed"
msgstr "Скачать все изменённые репозитории"
@@ -528,18 +529,26 @@ msgstr "Ошибка при выполнении шаблона"
msgid "Upgrade all installed packages"
msgstr "Обновить все установленные пакеты"
-#: upgrade.go:101
+#: upgrade.go:103
msgid "Error pulling repos"
msgstr "Ошибка при извлечении репозиториев"
-#: upgrade.go:107 upgrade.go:124
+#: upgrade.go:109 upgrade.go:126
msgid "Error checking for updates"
msgstr "Ошибка при проверке обновлений"
-#: upgrade.go:127
+#: upgrade.go:129
msgid "There is nothing to do."
msgstr "Здесь нечего делать."
+#, fuzzy
+#~ msgid "Error getting current executable"
+#~ msgstr "Ошибка при получении рабочего каталога"
+
+#, fuzzy
+#~ msgid "Error mounting"
+#~ msgstr "Ошибка при кодировании конфигурации"
+
#, fuzzy
#~ msgid "Unable to create config directory"
#~ msgstr "Не удалось создать каталог конфигурации ALR"
diff --git a/internal/utils/cmd.go b/internal/utils/cmd.go
index 09e778f..c084d94 100644
--- a/internal/utils/cmd.go
+++ b/internal/utils/cmd.go
@@ -80,7 +80,6 @@ func DropCapsToAlrUser() error {
return nil
}
-// Returns cli.Exit to
func ExitIfCantDropCapsToAlrUser() cli.ExitCoder {
err := DropCapsToAlrUser()
if err != nil {
@@ -95,3 +94,63 @@ func ExitIfNotRoot() error {
}
return nil
}
+
+func EnuseIsAlrUser() error {
+ uid, gid, err := GetUidGidAlrUser()
+ if err != nil {
+ return err
+ }
+ newUid := syscall.Getuid()
+ if newUid != uid {
+ return errors.New("new uid don't matches requested")
+ }
+ newGid := syscall.Getgid()
+ if newGid != gid {
+ return errors.New("new gid don't matches requested")
+ }
+ return nil
+}
+
+func EnuseIsWheelMember() error {
+ currentUser, err := user.Current()
+ if err != nil {
+ return err
+ }
+
+ group, err := user.LookupGroup("wheel")
+ if err != nil {
+ return err
+ }
+
+ groups, err := currentUser.GroupIds()
+ if err != nil {
+ return err
+ }
+
+ for _, gid := range groups {
+ if gid == group.Gid {
+ return nil
+ }
+ }
+ return errors.New("looks like is not wheel member")
+}
+
+func EscalateToRootGid() error {
+ return syscall.Setgid(0)
+}
+
+func EscalateToRootUid() error {
+ return syscall.Setuid(0)
+}
+
+func EscalateToRoot() error {
+ err := EscalateToRootUid()
+ if err != nil {
+ return err
+ }
+ err = EscalateToRootGid()
+ if err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
new file mode 100644
index 0000000..9c0b8f7
--- /dev/null
+++ b/internal/utils/utils.go
@@ -0,0 +1,23 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// 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 .
+
+package utils
+
+import "golang.org/x/sys/unix"
+
+func NoNewPrivs() error {
+ return unix.Prctl(unix.PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)
+}
diff --git a/main.go b/main.go
index 3a28be3..d36ae71 100644
--- a/main.go
+++ b/main.go
@@ -86,7 +86,6 @@ func GetApp() *cli.App {
InternalBuildCmd(),
InternalInstallCmd(),
InternalMountCmd(),
- InternalUnmountCmd(),
},
Before: func(c *cli.Context) error {
if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" {
diff --git a/pkg/build/build.go b/pkg/build/build.go
index 2cfae77..31c9e93 100644
--- a/pkg/build/build.go
+++ b/pkg/build/build.go
@@ -352,16 +352,17 @@ func (b *Builder) BuildPackage(
) (*BuildResult, error) {
scriptPath := input.script
+ slog.Debug("ReadScript")
sf, err := b.scriptExecutor.ReadScript(ctx, scriptPath)
if err != nil {
return nil, err
}
+ slog.Debug("ExecuteFirstPass")
basePkg, varsOfPackages, err := b.scriptExecutor.ExecuteFirstPass(ctx, input, sf)
if err != nil {
return nil, err
}
- slog.Debug("ExecuteFirstPass", "basePkg", basePkg, "varsOfPackages", varsOfPackages)
builtPaths := make([]string, 0)
@@ -384,6 +385,7 @@ func (b *Builder) BuildPackage(
}
}
+ slog.Debug("ViewScript")
err = b.scriptViewerExecutor.ViewScript(ctx, input, sf, basePkg)
if err != nil {
return nil, err
@@ -423,21 +425,25 @@ func (b *Builder) BuildPackage(
}
sources, checksums = removeDuplicatesSources(sources, checksums)
+ slog.Debug("installBuildDeps")
err = b.installBuildDeps(ctx, input, buildDepends)
if err != nil {
return nil, err
}
+ slog.Debug("installOptDeps")
err = b.installOptDeps(ctx, input, optDepends)
if err != nil {
return nil, err
}
+ slog.Debug("BuildALRDeps")
_, builtNames, repoDeps, err := b.BuildALRDeps(ctx, input, depends)
if err != nil {
return nil, err
}
+ slog.Debug("PrepareDirs")
err = b.scriptExecutor.PrepareDirs(ctx, input, basePkg)
if err != nil {
return nil, err
@@ -446,6 +452,7 @@ func (b *Builder) BuildPackage(
// builtPaths = append(builtPaths, newBuildPaths...)
slog.Info(gotext.Get("Downloading sources"))
+ slog.Debug("DownloadSources")
err = b.sourceExecutor.DownloadSources(
ctx,
input,
@@ -459,6 +466,7 @@ func (b *Builder) BuildPackage(
return nil, err
}
+ slog.Debug("ExecuteSecondPass")
res, err := b.scriptExecutor.ExecuteSecondPass(
ctx,
input,
diff --git a/pkg/build/main_build.go b/pkg/build/main_build.go
index e91ec35..f23c188 100644
--- a/pkg/build/main_build.go
+++ b/pkg/build/main_build.go
@@ -19,27 +19,34 @@ package build
import (
"log/slog"
+ "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
)
func NewMainBuilder(
cfg Config,
repos PackageFinder,
-) *Builder {
+) (*Builder, error) {
+ installerExecutor, err := GetSafeInstaller()
+ if err != nil {
+ slog.Error("i will panic GetSafeInstaller", "err", err)
+ return nil, err
+ }
+
+ // It is very important!
+ // See https://stackoverflow.com/questions/47296408/cannot-open-uid-map-for-writing-from-an-app-with-cap-setuid-capability-set
+ if err := utils.NoNewPrivs(); err != nil {
+ return nil, err
+ }
+
s, err := GetSafeScriptExecutor()
if err != nil {
- slog.Info("i will panic")
- panic(err)
+ slog.Error("i will panic GetSafeScriptExecutor", "err", err)
+ return nil, err
}
mgr := manager.Detect()
- installerExecutor, err := GetSafeInstaller()
- if err != nil {
- slog.Info("i will panic")
- panic(err)
- }
-
builder := &Builder{
scriptExecutor: s,
cacheExecutor: &Cache{
@@ -61,5 +68,5 @@ func NewMainBuilder(
repos: repos,
}
- return builder
+ return builder, nil
}
diff --git a/pkg/build/safe.go b/pkg/build/safe.go
index 6852b60..edf34ec 100644
--- a/pkg/build/safe.go
+++ b/pkg/build/safe.go
@@ -229,6 +229,7 @@ func GetSafeScriptExecutor() (ScriptExecutor, error) {
"LOGNAME=alr",
"USER=alr",
"PATH=/usr/bin:/bin:/usr/local/bin",
+ "ALR_LOG_LEVEL=DEBUG",
}
uid, gid, err := utils.GetUidGidAlrUser()
if err != nil {
@@ -247,6 +248,9 @@ func GetSafeScriptExecutor() (ScriptExecutor, error) {
Cmd: cmd,
Logger: logger.GetHCLoggerAdapter(),
SkipHostEnv: true,
+ UnixSocketConfig: &plugin.UnixSocketConfig{
+ Group: "alr",
+ },
})
rpcClient, err := client.Client()
if err != nil {
diff --git a/pkg/build/safe_installer.go b/pkg/build/safe_installer.go
index 5bcefb4..09bb0ff 100644
--- a/pkg/build/safe_installer.go
+++ b/pkg/build/safe_installer.go
@@ -26,7 +26,6 @@ import (
"github.com/hashicorp/go-plugin"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
- "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
)
type InstallerPlugin struct {
@@ -46,7 +45,6 @@ func (r *InstallerRPC) InstallLocal(paths []string) error {
}
func (s *InstallerRPCServer) InstallLocal(paths []string, reply *struct{}) error {
- slog.Warn("install", "paths", paths)
return s.Impl.InstallLocal(paths)
}
@@ -60,8 +58,9 @@ func (s *InstallerRPCServer) Install(pkgs []string, reply *struct{}) error {
}
func (r *InstallerRPC) RemoveAlreadyInstalled(paths []string) ([]string, error) {
- err := r.client.Call("Plugin.RemoveAlreadyInstalled", paths, nil)
- return nil, err
+ var val []string
+ err := r.client.Call("Plugin.RemoveAlreadyInstalled", paths, &val)
+ return val, err
}
func (s *InstallerRPCServer) RemoveAlreadyInstalled(pkgs []string, res *[]string) error {
@@ -95,16 +94,8 @@ func GetSafeInstaller() (InstallerExecutor, error) {
"ALR_LOG_LEVEL=DEBUG",
"XDG_SESSION_CLASS=user",
)
- uid, gid, err := utils.GetUidGidAlrUser()
- if err != nil {
- return nil, err
- }
- cmd.SysProcAttr = &syscall.SysProcAttr{
- Credential: &syscall.Credential{
- Uid: uint32(uid),
- Gid: uint32(gid),
- },
- }
+
+ slog.Debug("safe installer setup", "uid", syscall.Getuid(), "gid", syscall.Getgid())
client := plugin.NewClient(&plugin.ClientConfig{
HandshakeConfig: HandshakeConfig,
@@ -119,7 +110,6 @@ func GetSafeInstaller() (InstallerExecutor, error) {
})
rpcClient, err := client.Client()
if err != nil {
- slog.Info("1")
return nil, err
}
diff --git a/pkg/manager/apt_rpm.go b/pkg/manager/apt_rpm.go
index 03d25e2..b55423a 100644
--- a/pkg/manager/apt_rpm.go
+++ b/pkg/manager/apt_rpm.go
@@ -20,6 +20,7 @@ import (
"fmt"
"os/exec"
"strings"
+ "syscall"
)
// APTRpm represents the APT-RPM package manager
@@ -110,7 +111,11 @@ func (a *APTRpm) UpgradeAll(opts *Opts) error {
func (a *APTRpm) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
var cmd *exec.Cmd
if opts.AsRoot {
- cmd = exec.Command(getRootCmd(a.rootCmd), mgrCmd)
+ if syscall.Geteuid() != 0 {
+ cmd = exec.Command(getRootCmd(a.rootCmd), mgrCmd)
+ } else {
+ cmd = exec.Command(mgrCmd)
+ }
cmd.Args = append(cmd.Args, opts.Args...)
cmd.Args = append(cmd.Args, args...)
} else {
diff --git a/pkg/manager/managers.go b/pkg/manager/managers.go
index 0219bd3..6cff16a 100644
--- a/pkg/manager/managers.go
+++ b/pkg/manager/managers.go
@@ -115,7 +115,7 @@ func getRootCmd(rootCmd string) string {
func setCmdEnv(cmd *exec.Cmd) {
cmd.Env = os.Environ()
cmd.Stdin = os.Stdin
- cmd.Stdout = os.Stdout
+ cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
}
diff --git a/repo.go b/repo.go
index 55bf1c6..1a973ad 100644
--- a/repo.go
+++ b/repo.go
@@ -20,7 +20,6 @@
package main
import (
- "log/slog"
"os"
"path/filepath"
@@ -76,7 +75,7 @@ func AddRepoCmd() *cli.Command {
reposSlice := cfg.Repos()
for _, repo := range reposSlice {
- if repo.URL == repoURL {
+ if repo.URL == repoURL || repo.Name == name {
return cliutils.FormatCliExit(gotext.Get("Repo %s already exists", repo.Name), nil)
}
}
@@ -154,8 +153,7 @@ func RemoveRepoCmd() *cli.Command {
}
}
if !found {
- slog.Error(gotext.Get("Repo does not exist"), "name", name)
- os.Exit(1)
+ return cliutils.FormatCliExit(gotext.Get("Repo \"%s\" does not exist", name), nil)
}
cfg.SetRepos(slices.Delete(reposSlice, index, index+1))
diff --git a/upgrade.go b/upgrade.go
index 05254eb..94101a0 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -76,11 +76,13 @@ func UpgradeCmd() *cli.Command {
return cliutils.FormatCliExit(gotext.Get("Error initialization database"), err)
}
- slog.Debug("builder setup")
- builder := build.NewMainBuilder(
+ builder, err := build.NewMainBuilder(
cfg,
rs,
)
+ if err != nil {
+ return err
+ }
info, err := distro.ParseOSRelease(ctx)
slog.Debug("ParseOSRelease", "err", err)