reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(npc): create ipsets with only valid xml characters

Browse Source 
Why:
* xml output of ipset is invalid because ipset itself doesn't appear to
 escape invalid chars

* fixes #2958
This commit is contained in:
stuart.warren committed 2017-05-15 11:20:04 +01:00
1 parent 255d087416
commit 9cbf0289d8
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
npc/shortname.go
+3 -2
View File
@@ -7,12 +7,13 @@ import (
const ( const (
// This array: // This array:
// * Must include only printable UTF8 characters that are represented with a single byte // * Must include only printable UTF8 characters that are represented with a single byte (http://www.utf8-chartable.de/)
// * Must be at least of length 85 (`len("weave-") + l(2^160)/l(85)` equals 31, the maximum ipset name length) // * Must be at least of length 85 (`len("weave-") + l(2^160)/l(85)` equals 31, the maximum ipset name length)
// * Must not include commas as those are treated specially by `ipset add` when adding a named set to a list:set // * Must not include commas as those are treated specially by `ipset add` when adding a named set to a list:set
// * Should not include space for readability // * Should not include space for readability
// * Should not include invalid chars for XML `<>&"'`
// * Should not include single quote or backslash to be nice to shell users // * Should not include single quote or backslash to be nice to shell users
ShortNameSymbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789(){}[]<>_$%^&*|/?.;:@#~" ShortNameSymbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789(){}[]+=_$%^!*|/?.;:@#~"
) )
// sha1 hash an arbitrary string and represent it using the full range of // sha1 hash an arbitrary string and represent it using the full range of