Fix netrc one-line parsing and enforce dummy login writes
All checks were successful
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.

This commit is contained in:
Abel Luck 2026-03-03 08:52:31 +01:00
parent c24af42fc0
commit aa4732af7b
4 changed files with 89 additions and 22 deletions

View file

@ -93,23 +93,34 @@ func parse(path string) ([]entry, error) {
}
fields := strings.Fields(line)
if len(fields) < 2 {
continue
}
switch fields[0] {
case "machine":
if current != nil {
entries = append(entries, *current)
}
current = &entry{machine: fields[1]}
case "login":
if current != nil {
current.login = fields[1]
}
case "password":
if current != nil {
current.password = fields[1]
for i := 0; i < len(fields); {
switch fields[i] {
case "machine":
if i+1 >= len(fields) {
i++
continue
}
if current != nil {
entries = append(entries, *current)
}
current = &entry{machine: fields[i+1]}
i += 2
case "login":
if current != nil && i+1 < len(fields) {
current.login = fields[i+1]
i += 2
continue
}
i++
case "password":
if current != nil && i+1 < len(fields) {
current.password = fields[i+1]
i += 2
continue
}
i++
default:
i++
}
}
}
@ -130,11 +141,12 @@ func write(path string, entries []entry) error {
}
var b strings.Builder
for i, e := range entries {
if i > 0 {
b.WriteString("\n")
for _, e := range entries {
login := e.login
if login == "" {
login = "dummy"
}
fmt.Fprintf(&b, "machine %s\nlogin %s\npassword %s\n", e.machine, e.login, e.password)
fmt.Fprintf(&b, "machine %s login %s password %s\n", e.machine, login, e.password)
}
if err := os.WriteFile(path, []byte(b.String()), 0600); err != nil {