ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

host-local: trim whitespace from container IDs and disk file contents

Browse Source 
It doesn't seem like container IDs should really have whitespace or
newlines in them.  As a complete edge-case, manipulating the host-local
store's IP reservations with 'echo' puts a newline at the end, which
caused matching to fail in ReleaseByID().  Don't ask...
This commit is contained in:
Dan Williams
2016-12-09 18:16:38 -06:00
parent b0808a006a
commit 76028d7f8c
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ipam/host-local/backend/disk/backend.go
View File

@ -20,6 +20,7 @@ import (
"net"
"os"
"path/filepath"
"strings"
)
const lastIPFile = "last_reserved_ip"
@ -56,7 +57,7 @@ func (s *Store) Reserve(id string, ip net.IP) (bool, error) {
if err != nil {
return false, err
}
if _, err := f.WriteString(id); err != nil {
if _, err := f.WriteString(strings.TrimSpace(id)); err != nil {
f.Close()
os.Remove(f.Name())
return false, err
@ -99,7 +100,7 @@ func (s *Store) ReleaseByID(id string) error {
if err != nil {
return nil
}
if string(data) == id {
if strings.TrimSpace(string(data)) == strings.TrimSpace(id) {
if err := os.Remove(path); err != nil {
return nil
}