guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize compress

Browse Source
This commit is contained in:
fatedier 2016-04-05 15:25:55 +08:00
parent 80fc76da52
commit b3ee746be8
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frp/utils/conn/conn.go
View File

@ -209,7 +209,7 @@ func PipeDecrypt(r net.Conn, w net.Conn, key string) error {
return err return err
} }
res, err := laes.Decrypt(buf) res, err := laes.Decrypto(buf)
if err != nil { if err != nil {
log.Error("Decrypt [%s] error, %v", string(buf), err) log.Error("Decrypt [%s] error, %v", string(buf), err)
return fmt.Errorf("Decrypt [%s] error: %v", string(buf), err) return fmt.Errorf("Decrypt [%s] error: %v", string(buf), err)
@ -239,7 +239,7 @@ func PipeEncrypt(r net.Conn, w net.Conn, key string) error {
if err != nil { if err != nil {
return err return err
} }
res, err := laes.Encrypt(buf[:n]) res, err := laes.Encrypto(buf[:n])
if err != nil { if err != nil {
log.Error("Encrypt error: %v", err) log.Error("Encrypt error: %v", err)
return fmt.Errorf("Encrypt error: %v", err) return fmt.Errorf("Encrypt error: %v", err)

54
src/frp/utils/pcrypto/pcrypto.go
View File

@ -1,17 +1,3 @@
// Copyright 2016 fatedier, fatedier@gmail.com
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package pcrypto package pcrypto
import ( import (
@ -39,37 +25,37 @@ func (pc *Pcrypto) Init(key []byte) error {
return err return err
} }
func (pc *Pcrypto) Encrypt(src []byte) ([]byte, error) { func (pc *Pcrypto) Encrypto(src []byte) ([]byte, error) {
// gzip
var zbuf bytes.Buffer
zwr, err := gzip.NewWriterLevel(&zbuf, -1)
if err != nil {
return nil, err
}
defer zwr.Close()
zwr.Write(src)
zwr.Flush()
fmt.Println("com,src,en", len(src), len(zbuf.Bytes()))
// aes // aes
src = pKCS7Padding(src, aes.BlockSize) src = pKCS7Padding(zbuf.Bytes(), aes.BlockSize)
blockMode := cipher.NewCBCEncrypter(pc.paes, pc.pkey) blockMode := cipher.NewCBCEncrypter(pc.paes, pc.pkey)
crypted := make([]byte, len(src)) crypted := make([]byte, len(src))
blockMode.CryptBlocks(crypted, src) blockMode.CryptBlocks(crypted, src)
// gzip fmt.Println("aes,src,en", len(src), len(crypted))
var zbuf bytes.Buffer
zwr := gzip.NewWriter(&zbuf)
defer zwr.Close()
zwr.Write(crypted)
zwr.Flush()
// base64 // base64
return []byte(base64.StdEncoding.EncodeToString(zbuf.Bytes())), nil return []byte(base64.StdEncoding.EncodeToString(crypted)), nil
} }
func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) { func (pc *Pcrypto) Decrypto(str []byte) ([]byte, error) {
// base64 // base64
data, err := base64.StdEncoding.DecodeString(string(str)) data, err := base64.StdEncoding.DecodeString(string(str))
if err != nil { if err != nil {
return nil, err return nil, err
} }
// gunzip
zbuf := bytes.NewBuffer(data)
zrd, _ := gzip.NewReader(zbuf)
defer zrd.Close()
data, _ = ioutil.ReadAll(zrd)
// aes // aes
decryptText, err := hex.DecodeString(fmt.Sprintf("%x", data)) decryptText, err := hex.DecodeString(fmt.Sprintf("%x", data))
if err != nil { if err != nil {
@ -85,7 +71,13 @@ func (pc *Pcrypto) Decrypt(str []byte) ([]byte, error) {
blockMode.CryptBlocks(decryptText, decryptText) blockMode.CryptBlocks(decryptText, decryptText)
decryptText = pKCS7UnPadding(decryptText) decryptText = pKCS7UnPadding(decryptText)
return decryptText, nil // gunzip
zbuf := bytes.NewBuffer(decryptText)
zrd, _ := gzip.NewReader(zbuf)
defer zrd.Close()
data, _ = ioutil.ReadAll(zrd)
return data, nil
} }
func pKCS7Padding(ciphertext []byte, blockSize int) []byte { func pKCS7Padding(ciphertext []byte, blockSize int) []byte {