curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #672: Change the grep pattern 

This pattern ensures the user "cloudflared" more precisely
This commit is contained in:
Yonatan Romero 2022-09-19 18:04:47 +02:00
parent c219cc24a4
commit bdce0a39e8
No known key found for this signature in database
GPG Key ID: 28EEA3C26EDA40BC
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloudflared/linux_service.go
View File

@ -273,7 +273,7 @@ func installSystemd(templateArgs *ServiceTemplateArgs, log *zerolog.Logger) erro
} }
} }
// Create the cloudflared user if it does not exist // Create the cloudflared user if it does not exist
if err := runCommand("grep", "-qw", fmt.Sprintf("^%s", cloudflaredUser), "/etc/passwd"); err != nil { if err := runCommand("grep", "-q", fmt.Sprintf("^%s:", cloudflaredUser), "/etc/passwd"); err != nil {
if err := runCommand("useradd", "--system", "--no-create-home", "--home-dir=/nonexistent", "--shell=/usr/sbin/nologin", cloudflaredUser); err != nil { if err := runCommand("useradd", "--system", "--no-create-home", "--home-dir=/nonexistent", "--shell=/usr/sbin/nologin", cloudflaredUser); err != nil {
log.Err(err).Msgf("useradd %s error", cloudflaredUser) log.Err(err).Msgf("useradd %s error", cloudflaredUser)
return err return err
@ -350,7 +350,7 @@ func uninstallSystemd(log *zerolog.Logger) error {
return err return err
} }
// Delete the cloudflared user if it exists // Delete the cloudflared user if it exists
if err := runCommand("grep", "-qw", fmt.Sprintf("^%s", cloudflaredUser), "/etc/passwd"); err == nil { if err := runCommand("grep", "-q", fmt.Sprintf("^%s:", cloudflaredUser), "/etc/passwd"); err == nil {
if err := runCommand("userdel", cloudflaredUser); err != nil { if err := runCommand("userdel", cloudflaredUser); err != nil {
log.Err(err).Msgf("userdel %s error", cloudflaredUser) log.Err(err).Msgf("userdel %s error", cloudflaredUser)
return err return err