Explorar o código

portable: avoid to log user provided password

disable DNS Multicast as default

Fixes #135 and #136
Nicola Murino %!s(int64=5) %!d(string=hai) anos
pai
achega
19fc58dd1f
Modificáronse 2 ficheiros con 4 adicións e 2 borrados
  1. 1 1
      cmd/portable.go
  2. 3 1
      service/service_portable.go

+ 1 - 1
cmd/portable.go

@@ -161,7 +161,7 @@ func init() {
 		"Allowed file extensions case insensitive. The format is /dir::ext1,ext2. For example: \"/somedir::.jpg,.png\"")
 	portableCmd.Flags().StringArrayVar(&portableDeniedExtensions, "denied-extensions", []string{},
 		"Denied file extensions case insensitive. The format is /dir::ext1,ext2. For example: \"/somedir::.jpg,.png\"")
-	portableCmd.Flags().BoolVarP(&portableAdvertiseService, "advertise-service", "S", true,
+	portableCmd.Flags().BoolVarP(&portableAdvertiseService, "advertise-service", "S", false,
 		"Advertise SFTP service using multicast DNS")
 	portableCmd.Flags().BoolVarP(&portableAdvertiseCredentials, "advertise-credentials", "C", false,
 		"If the SFTP service is advertised via multicast DNS, this flag allows to put username/password inside the advertised TXT record")

+ 3 - 1
service/service_portable.go

@@ -32,12 +32,14 @@ func (s *Service) StartPortableMode(sftpdPort int, enabledSSHCommands []string,
 	if len(s.PortableUser.Username) == 0 {
 		s.PortableUser.Username = "user"
 	}
+	printablePassword := "[redacted]"
 	if len(s.PortableUser.PublicKeys) == 0 && len(s.PortableUser.Password) == 0 {
 		var b strings.Builder
 		for i := 0; i < 8; i++ {
 			b.WriteRune(chars[rand.Intn(len(chars))])
 		}
 		s.PortableUser.Password = b.String()
+		printablePassword = s.PortableUser.Password
 	}
 	dataProviderConf := config.GetProviderConf()
 	dataProviderConf.Driver = dataprovider.MemoryDataProviderName
@@ -108,7 +110,7 @@ func (s *Service) StartPortableMode(sftpdPort int, enabledSSHCommands []string,
 
 	logger.InfoToConsole("Portable mode ready, SFTP port: %v, user: %#v, password: %#v, public keys: %v, directory: %#v, "+
 		"permissions: %+v, enabled ssh commands: %v file extensions filters: %+v", sftpdConf.BindPort, s.PortableUser.Username,
-		s.PortableUser.Password, s.PortableUser.PublicKeys, s.getPortableDirToServe(), s.PortableUser.Permissions,
+		printablePassword, s.PortableUser.PublicKeys, s.getPortableDirToServe(), s.PortableUser.Permissions,
 		sftpdConf.EnabledSSHCommands, s.PortableUser.Filters.FileExtensions)
 	return nil
 }