Merge pull request #12 from ffuf/urlencode

URL Encoder and decoder

pkg/pencode/encoders.go

@@ -2,11 +2,15 @@ package pencode
 
 import (
  "fmt"
+ "sort"
 )
 
 var availableEncoders = map[string]Encoder{
- "b64encode": Base64Encoder{},
- "b64decode": Base64Decoder{},
+ "b64encode": Base64Encoder{},
+ "b64decode": Base64Decoder{},
+ "urlencode": URLEncoder{},
+ "urldecode": URLDecoder{},
+ "urlencodeall": URLEncoderAll{},
 }
 
 type Chain struct {
@@ -69,7 +73,15 @@ func (c *Chain) Usage() {
  }
  format := fmt.Sprintf(" %%-%ds- %%s\n", max_length+2)
 
- for k, v := range availableEncoders {
- fmt.Printf(format, k, v.HelpText())
+ // Sort the encoders alphabetically
+ names := make([]string, 0, len(availableEncoders))
+ for k := range availableEncoders {
+ names = append(names, k)
+ }
+ sort.Strings(names)
+
+ for _, n := range names {
+ v := availableEncoders[n]
+ fmt.Printf(format, n, v.HelpText())
  }
 }

pkg/pencode/urldecode.go

@@ -0,0 +1,19 @@
+package pencode
+
+import (
+ "net/url"
+)
+
+type URLDecoder struct{}
+
+func (u URLDecoder) Encode(input []byte) ([]byte, error) {
+ output, err := url.QueryUnescape(string(input))
+ if err != nil {
+ return []byte{}, err
+ }
+ return []byte(output), err
+}
+
+func (u URLDecoder) HelpText() string {
+ return "URL decode"
+}

pkg/pencode/urlencode.go

@@ -0,0 +1,15 @@
+package pencode
+
+import (
+ "net/url"
+)
+
+type URLEncoder struct{}
+
+func (u URLEncoder) Encode(input []byte) ([]byte, error) {
+ return []byte(url.QueryEscape(string(input))), nil
+}
+
+func (u URLEncoder) HelpText() string {
+ return "URL encode reserved characters"
+}

pkg/pencode/urlencodeall.go

@@ -0,0 +1,24 @@
+package pencode
+
+import (
+ "bytes"
+)
+
+const upperhex = "0123456789ABCDEF"
+
+type URLEncoderAll struct{}
+
+func (u URLEncoderAll) Encode(input []byte) ([]byte, error) {
+ var buf bytes.Buffer
+ for _, c := range input {
+ // Add "%"
+ buf.WriteByte(37)
+ buf.WriteByte(upperhex[c>>4])
+ buf.WriteByte(upperhex[c&15])
+ }
+ return buf.Bytes(), nil
+}
+
+func (u URLEncoderAll) HelpText() string {
+ return "URL encode all characters"
+}