diff --git a/go.mod b/go.mod index 0ec955315..7e12cf086 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module kitty go 1.19 require ( + github.com/jamesruan/go-rfc1924 v0.0.0-20170108144916-2767ca7c638f github.com/seancfoley/ipaddress-go v1.2.1 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 80f32547d..58c24c318 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jamesruan/go-rfc1924 v0.0.0-20170108144916-2767ca7c638f h1:Ko4+g6K16vSyUrtd/pPXuQnWsiHe5BYptEtTxfwYwCc= +github.com/jamesruan/go-rfc1924 v0.0.0-20170108144916-2767ca7c638f/go.mod h1:eHzfhOKbTGJEGPSdMHzU6jft192tHHt2Bu2vIZArvC0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/seancfoley/bintree v1.1.0 h1:6J0rj9hLNLIcWSsfYdZ4ZHkMHokaK/PHkak8qyBO/mc= github.com/seancfoley/bintree v1.1.0/go.mod h1:CtE6qO6/n9H3V2CAGEC0lpaYr6/OijhNaMG/dt7P70c= diff --git a/tools/base85/base85.go b/tools/base85/base85.go deleted file mode 100644 index 53c889a4f..000000000 --- a/tools/base85/base85.go +++ /dev/null @@ -1,328 +0,0 @@ -// package base85 -// This package provides a RFC1924 implementation of base85 encoding. -// -// See http://www.ietf.org/rfc/rfc1924.txt -package base85 - -import ( - "bufio" - "errors" - "io" - "strconv" -) - -// 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~ -var b2c_table = [85]byte{ - // 0 1 2 3 4 5 6 7 8 9 A B C D E F - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, //0 - 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, //1 - 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, //2 - 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x21, 0x23, //3 - 0x24, 0x25, 0x26, 0x28, 0x29, 0x2A, 0x2B, 0x2D, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x5E, 0x5F, //4 - 0x60, 0x7B, 0x7C, 0x7D, 0x7E, -} - -var encode [85]byte -var decode [256]byte - -func init() { - copy(encode[:], b2c_table[:]) - for i := 0; i < len(decode); i++ { - decode[i] = 0xFF - } - for i := 0; i < len(encode); i++ { - decode[encode[i]] = byte(i) - } -} - -// encodeChunk encodes 4 byte-chunk to 5 byte -// if chunk size is less then 4, then it is padded before convertion. -// return written bytes or error -func encodeChunk(dst, src []byte) int { - if len(src) == 0 { - return 0 - } - - //read 4 byte as big-endian uint32 into small endian uint32 - var val uint32 - switch len(src) { - default: - val |= uint32(src[3]) - fallthrough - case 3: - val |= uint32(src[2]) << 8 - fallthrough - case 2: - val |= uint32(src[1]) << 16 - fallthrough - case 1: - val |= uint32(src[0]) << 24 - } - - buf := [5]byte{0, 0, 0, 0, 0} - - for i := 4; i >= 0; i-- { - r := val % 85 - val /= 85 - buf[i] = encode[r] - } - - m := EncodedLen(len(src)) - copy(dst[:], buf[:m]) - return m -} - -var decode_base = [5]uint32{85 * 85 * 85 * 85, 85 * 85 * 85, 85 * 85, 85, 1} - -// decodeChunk decodes 5 byte-chunk to 4 byte -// if chunk size is less then 5, then it is padded before convertion. -// return written bytes and error input index -func decodeChunk(dst, src []byte) (int, int) { - if len(src) == 0 { - return 0, 0 - } - var val uint32 - m := DecodedLen(len(src)) - buf := [5]byte{84, 84, 84, 84, 84} - for i := 0; i < len(src); i++ { - e := decode[src[i]] - if e == 0xFF { - return 0, i + 1 - } - buf[i] = e - } - - for i := 0; i < 5; i++ { - r := buf[i] - val += uint32(r) * decode_base[i] - } - //small endian uint32 to big endian uint32 in bytes - switch m { - default: - dst[3] = byte(val & 0xff) - fallthrough - case 3: - dst[2] = byte((val >> 8) & 0xff) - fallthrough - case 2: - dst[1] = byte((val >> 16) & 0xff) - fallthrough - case 1: - dst[0] = byte((val >> 24) & 0xff) - } - return m, 0 -} - -// Encode encodes src into dst, return the bytes written -// The dst must have size of EncodedLen(len(src)) -func Encode(dst, src []byte) int { - n := 0 - for len(src) > 0 { - if len(src) < 4 { - n += encodeChunk(dst, src) - return n - } - n += encodeChunk(dst[:5], src[:4]) - src = src[4:] - dst = dst[5:] - } - return n -} - -// EncodeToString returns the base85 encoding of src. -func EncodeToString(src []byte) string { - buf := make([]byte, EncodedLen(len(src))) - Encode(buf, src) - return string(buf) -} - -// DecodeString returns the bytes represented by the base85 string s. -func DecodeString(src string) ([]byte, error) { - buf := make([]byte, DecodedLen(len(src))) - _, err := Decode(buf, []byte(src)) - return buf, err -} - -// Decode decodes src into dst, return the bytes written -// The dst must have size of DecodedLen(len(src)) -// An CorruptInputError is returned when invalid character is found in src. -func Decode(dst, src []byte) (int, error) { - f := 0 - t := 0 - for len(src) > 0 { - if len(src) < 5 { - w, err := decodeChunk(dst, src) - if err > 0 { - return t, CorruptInputError(f + err) - } - return t + w, nil - } - - _, err := decodeChunk(dst[:4], src[:5]) - if err > 0 { - return t, CorruptInputError(f + err) - } else { - t += 4 - f += 5 - src = src[5:] - dst = dst[4:] - } - } - return t, nil -} - -// EncodedLen returns the length in bytes of the base64 encoding of an input -// buffer of length n. -func EncodedLen(n int) int { - s := n / 4 - r := n % 4 - if r > 0 { - return s*5 + 5 - (4 - r) - } else { - return s * 5 - } -} - -// DecodedLen returns the maximum length in bytes of the decoded data -// corresponding to n bytes of base85-encoded data. -func DecodedLen(n int) int { - s := n / 5 - r := n % 5 - if r > 0 { - return s*4 + 4 - (5 - r) - } else { - return s * 4 - } -} - -type encoder struct { - w io.Writer - bufin [4]byte - encoded [5]byte - fill int - err error -} - -func (e *encoder) Write(p []byte) (n int, err error) { - if e.err != nil { - return 0, e.err - } - - for len(p) >= len(e.bufin)-e.fill { - //copy len(e.buf) - fill bytes into e.buf to make it full - to_copy := len(e.bufin) - e.fill - copy(e.bufin[e.fill:], p[:to_copy]) - p = p[to_copy:] - - //write the encoded whole buffer - encodeChunk(e.encoded[:], e.bufin[:]) - _, e.err = e.w.Write(e.encoded[:]) - if e.err != nil { - return n, e.err - } - n += 4 - e.fill = 0 - } - for i := 0; i < len(p); i++ { - e.bufin[e.fill] = p[i] - e.fill += 1 - } - return n, e.w.(*bufio.Writer).Flush() -} - -func (e *encoder) Close() error { - if e.err == nil && e.fill > 0 { - m := EncodedLen(e.fill) - encodeChunk(e.encoded[:m], e.bufin[:e.fill]) - _, e.err = e.w.Write(e.encoded[:m]) - if e.err != nil { - return e.err - } - e.err = e.w.(*bufio.Writer).Flush() - } - err := e.err - e.err = errors.New("encoder closed") - return err -} - -// NewEncoder returns a stream encoder of w. -// All write to the encoder is encoded into base85 and write to w. -// The writer should call Close() to indicate the end of stream -func NewEncoder(w io.Writer) io.WriteCloser { - encoder := new(encoder) - encoder.w = bufio.NewWriterSize(w, 1000) - return encoder -} - -type decoder struct { - r io.Reader - bufin [1000]byte - decoded []byte - fill int - err error -} - -// NewDecoder returns a stream decoder of r. -// All read from the reader will read the base85 encoded string from r and decode it. -func NewDecoder(r io.Reader) io.Reader { - decoder := new(decoder) - decoder.r = bufio.NewReaderSize(r, 1000) - return decoder -} - -func (d *decoder) Read(p []byte) (n int, err error) { - if d.err != nil { - return 0, d.err - } - - for len(p) > 0 { - // try filling the buffer - m, err := d.r.Read(d.bufin[d.fill:]) - d.fill += m - if err != nil { - // no further input, decode and copy into p - d.decoded = make([]byte, DecodedLen(d.fill)) - if d.err == io.EOF { - k, err := Decode(d.decoded, d.bufin[:d.fill]) - copy(p, d.decoded[:k]) - n += k - d.fill -= EncodedLen(k) - if err != nil { - d.err = err - return n, err - } - } else { - k, err := Decode(d.decoded, d.bufin[:d.fill-d.fill%5]) - copy(p, d.decoded[:k]) - n += k - d.fill -= EncodedLen(k) - if err != nil { - d.err = err - return n, err - } - } - d.err = err - return n, d.err - } - //decode d.fill - d.fill % 5 byte of d.bufin - chunked_max := d.fill - d.fill = d.fill % 5 - chunked_max -= d.fill - d.decoded = make([]byte, DecodedLen(chunked_max)) - k, err := Decode(d.decoded, d.bufin[:chunked_max]) - copy(p, d.decoded[:k]) - p = p[k:] - n += k - if err != nil { - d.err = err - return n, d.err - } - } - return n, d.err -} - -type CorruptInputError int64 - -func (e CorruptInputError) Error() string { - return "illegal base85 data at input byte " + strconv.FormatInt(int64(e), 10) -} diff --git a/tools/cmd/at/main.go b/tools/cmd/at/main.go index 27acd4b4d..6fbd0321b 100644 --- a/tools/cmd/at/main.go +++ b/tools/cmd/at/main.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/sys/unix" + "github.com/jamesruan/go-rfc1924/base85" "kitty" - "kitty/tools/base85" "kitty/tools/cli" "kitty/tools/crypto" "kitty/tools/tty" diff --git a/tools/crypto/crypto.go b/tools/crypto/crypto.go index c08d66080..9f897b0cb 100644 --- a/tools/crypto/crypto.go +++ b/tools/crypto/crypto.go @@ -9,8 +9,8 @@ import ( "crypto/sha256" "encoding/json" "fmt" + "github.com/jamesruan/go-rfc1924/base85" "golang.org/x/crypto/curve25519" - "kitty/tools/base85" "kitty/tools/utils" "time" )