mirror of
https://github.com/yggdrasil-network/yggdrasil-go.git
synced 2025-04-29 22:55:06 +03:00
Merge branch 'master' of https://github.com/tsuraan/yggdrasil-go into giduid
This commit is contained in:
commit
70b9274ddc
1 changed files with 18 additions and 0 deletions
|
@ -194,6 +194,8 @@ type yggArgs struct {
|
||||||
getaddr bool
|
getaddr bool
|
||||||
getsnet bool
|
getsnet bool
|
||||||
loglevel string
|
loglevel string
|
||||||
|
runuid int
|
||||||
|
rungid int
|
||||||
}
|
}
|
||||||
|
|
||||||
func getArgs() yggArgs {
|
func getArgs() yggArgs {
|
||||||
|
@ -208,7 +210,10 @@ func getArgs() yggArgs {
|
||||||
getaddr := flag.Bool("address", false, "returns the IPv6 address as derived from the supplied configuration")
|
getaddr := flag.Bool("address", false, "returns the IPv6 address as derived from the supplied configuration")
|
||||||
getsnet := flag.Bool("subnet", false, "returns the IPv6 subnet as derived from the supplied configuration")
|
getsnet := flag.Bool("subnet", false, "returns the IPv6 subnet as derived from the supplied configuration")
|
||||||
loglevel := flag.String("loglevel", "info", "loglevel to enable")
|
loglevel := flag.String("loglevel", "info", "loglevel to enable")
|
||||||
|
runuid := flag.Int("uid", -1, "drop privileges to this user id")
|
||||||
|
rungid := flag.Int("gid", -1, "drop privileges to this group id")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
return yggArgs{
|
return yggArgs{
|
||||||
genconf: *genconf,
|
genconf: *genconf,
|
||||||
useconf: *useconf,
|
useconf: *useconf,
|
||||||
|
@ -221,6 +226,8 @@ func getArgs() yggArgs {
|
||||||
getaddr: *getaddr,
|
getaddr: *getaddr,
|
||||||
getsnet: *getsnet,
|
getsnet: *getsnet,
|
||||||
loglevel: *loglevel,
|
loglevel: *loglevel,
|
||||||
|
runuid: *runuid,
|
||||||
|
rungid: *rungid,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,6 +373,17 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) {
|
||||||
address := n.core.Address()
|
address := n.core.Address()
|
||||||
subnet := n.core.Subnet()
|
subnet := n.core.Subnet()
|
||||||
public := n.core.GetSelf().Key
|
public := n.core.GetSelf().Key
|
||||||
|
// Lower permissions from root to something else, if the user wants to
|
||||||
|
if syscall.Getuid() == 0 {
|
||||||
|
if args.rungid > 0 {
|
||||||
|
fmt.Println("Dropping gid to ", args.rungid)
|
||||||
|
syscall.Setgid(args.rungid)
|
||||||
|
}
|
||||||
|
if args.runuid > 0 {
|
||||||
|
fmt.Println("Dropping uid to ", args.rungid)
|
||||||
|
syscall.Setuid(args.runuid)
|
||||||
|
}
|
||||||
|
}
|
||||||
logger.Infof("Your public key is %s", hex.EncodeToString(public[:]))
|
logger.Infof("Your public key is %s", hex.EncodeToString(public[:]))
|
||||||
logger.Infof("Your IPv6 address is %s", address.String())
|
logger.Infof("Your IPv6 address is %s", address.String())
|
||||||
logger.Infof("Your IPv6 subnet is %s", subnet.String())
|
logger.Infof("Your IPv6 subnet is %s", subnet.String())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue