Commit Graph

497 Commits (master)

Author SHA1 Message Date
Andy Wang e4b45a55e3 Optimise AddRecordLayer 4 years ago
Andy Wang e9243a2e9f Framing in Stream.Write to prevent silent short write 4 years ago
Andy Wang 17d57d9369 Add benchmarks 4 years ago
Andy Wang 8c9bab2a6f TLSConn.Write returns correct length 4 years ago
Andy Wang 78b27c0705 Fix tests 4 years ago
Andy Wang a51d45f41a Avoid unnecessary pass by pointer 4 years ago
Andy Wang 2bf7df0eb0 Integration tests 4 years ago
Andy Wang 0f66fec28e Remove impossible error 4 years ago
Andy Wang 93cf6dec6e Export fields for testing 4 years ago
Andy Wang d53b80208f Refactor for easier testing 4 years ago
Andy Wang e5bda61587 Close connections properly 4 years ago
Andy Wang 254b7152b6 Fix tests 4 years ago
Andy Wang 444182f5bb Purge impurity 4 years ago
Andy Wang bbc0752883 Minor code cleanup 4 years ago
Andy Wang 86214a1df0 Implement stream SetReadDeadline 4 years ago
Andy Wang e41394c83c Set frame size limit through multiplexer 4 years ago
Andy Wang 780d607436 Use io.Copy for redir 4 years ago
Andy Wang 77c33ff352 Fix redir null pointer 4 years ago
Andy Wang 15f343db31 Refactor server configuration 4 years ago
Andy Wang 97858197cd Move common types to its own package 4 years ago
Andy Wang 86095ba5e6 Refactor out Dialer 4 years ago
Andy Wang 2400a33818 Remove extra imports 4 years ago
Andy Wang 7e9fe952aa Move code around for clarity 4 years ago
Andy Wang ec76ecfe71 Update tests 4 years ago
Andy Wang 693544659f Refactor server transport 4 years ago
Andy Wang 7bfae8accd Refactor client side transport (breaks server) 4 years ago
Andy Wang 96845700f8 Add some integration tests for multiplex 4 years ago
Andy Wang a461059b4a Change behaviour of stream.Write(nil) 4 years ago
Andy Wang d3bc3b5a13 Use connutil in test 4 years ago
Andy Wang dc2b1124cb move function out of util 4 years ago
Andy Wang db9b848053 Simplify ReadTLS 4 years ago
Andy Wang 43ae82ec0e Fix test, improve err message and fix nil interface casting 4 years ago
Andy Wang 3bc59ff4b6 Fix tests 4 years ago
Andy Wang 2dc7c6d6e1 Correct switchboard valve's scope 4 years ago
Andy Wang e52daf1a39 Set defaults properly 4 years ago
Andy Wang 545164a300 Make send/receive buffer sizes configurable 4 years ago
Andy Wang 1de5045003 Use errors from io 4 years ago
Andy Wang 01e5d15d20 Code cleanup 4 years ago
Andy Wang 963dae829d Fix tests 4 years ago
Andy Wang c1f3408c2c Make key lengths explicit 4 years ago
Andy Wang 443aeecf5f Use cbeuw/connutil for connection testing 4 years ago
Andy Wang e7963b9e24 Change wsAcceptor's name to wsOnceListener 4 years ago
Andy Wang 8d375e3f9b remove redundant fields 4 years ago
Andy Wang e8af6233c1 Fix test 4 years ago
Andy Wang 285b966326 Fix server reply certificate length 4 years ago
Andy Wang 6a83c58143 Refactor authentication pipeline 4 years ago
Andy Wang a161409577 Rename a struct 4 years ago
Andy Wang 903a413afc Update test 4 years ago
Andy Wang 25e41d0941 Allow UDP option to be set in both commandline and json 4 years ago
Andy Wang a163f066a6 Refactor client config 4 years ago
Andy Wang 402cfc9e25 Logging for silent connections 4 years ago
Andy Wang 8d84ebd145 Code styles 4 years ago
Andy Wang dc262f7ca5 actually change the connId of a stream upon new assignment in send 4 years ago
Andy Wang e9afae72f0 better stream closing error message 4 years ago
Andy Wang 6d75aaff01 fix return shadowing 4 years ago
Andy Wang e4da349aa0 Add websocket auth test 4 years ago
Andy Wang 5e1931a11c Ineffectual assignments 4 years ago
notsure2 2de034ec92 Make keepalive optional on client -> server and server -> proxy connections. Use KeepAlive value in config (seconds). 4 years ago
Andy Wang 2327420f75 Allow remote host to be set in the client config file 4 years ago
Andy Wang d05809f2a6 Fix logging of transport 4 years ago
Andy Wang 766c27a129 Refactor if to switch case 4 years ago
Andy Wang 75ab568cda Merge branch 'master' of https://github.com/cbeuw/Cloak 4 years ago
Andy Wang 85e95de69c variable cert length in TLS server response 4 years ago
Andy Wang e33afb258a extract util testing function 4 years ago
Andy Wang 47410dbb97 add comments 4 years ago
Andy Wang db8dd19c9d fix broken benchmarks 4 years ago
beans 23082aff4f Allow RemotePort to be optionally set in JSON. If it's not set in JSON, Cloak falls back to SS_REMOTE_PORT in SS mode, or the -p argument in standalone 4 years ago
Andy Wang 517a6d6e57 Handle error and retry for Crypto.rand 4 years ago
Andy Wang e714dc61a8 Add a test for server touchstone 4 years ago
Andy Wang bc5ce842a0 Refactor makeAuthenticationPayload to allow easier tests 4 years ago
Andy Wang abc39e4e90 Refactor authentication data representations 4 years ago
Andy Wang fa1c109d90 Make authentication info arrays 4 years ago
Andy Wang fe8b2d78ef Change authenticationInfo structure 4 years ago
Andy Wang 13b66f6fef Remove redundant code 4 years ago
Andy Wang f90ad52455 Add default stream timeout value to client 4 years ago
Andy Wang 6f34229aa0 Make and add stream upon reception of all new streamIDs even if they are closing 4 years ago
Andy Wang 39e54bae6c Fix transport null pointer 4 years ago
Andy Wang 99fa812594 Fix pickRandConn bad loop 4 years ago
Andy Wang 3f5fdae284 Close session immediately after receiving signal 4 years ago
Andy Wang d65aee725a Improve stream closing logic and add tests 4 years ago
Andy Wang af5c8a381f Make a test streamline instead of modular 4 years ago
Andy Wang 3d3d06ec96 Fix tests 4 years ago
Andy Wang 74a70a3113 Refactor Transport and add tests 4 years ago
Andy Wang e7e4cd5726 Refactor frame reception processor 4 years ago
Andy Wang 65553f4ec4 Remove redundant base64 decoding 4 years ago
Andy Wang e3552b2afc Refactor server config parser and add tests 4 years ago
notsure2 d35472aea1 Store stream in packet receive path instead of asynchronously to fix https://github.com/cbeuw/Cloak/issues/74 5 years ago
Andy Wang bdd5308169 Code style clean up 5 years ago
Andy Wang 9c30c9b5b5 Add explanations on accepting websocket connections 5 years ago
Andy Wang fbee919f47 Use constants for Closing value 5 years ago
Andy Wang c26be98e79 Use sync.Map in multiplex instead of manual locks 5 years ago
Andy Wang 9cab4670f4 Make buffer close non-blocking 5 years ago
Andy Wang 4c17923717 Make write error close session as well 5 years ago
Andy Wang e2b21dae9f Fix tests 5 years ago
Andy Wang 3649283a49 Fix tests 5 years ago
Andy Wang 57f0c3d20a Close session when one connection drops 5 years ago
Andy Wang 34a4805c34 Add tests 5 years ago
Andy Wang a1b719b15f Add terminal message 5 years ago
Andy Wang beb6568ce0 Check before passive close 5 years ago
Andy Wang 3b3cd277f8 Fix stream not closing 5 years ago
Andy Wang 67159abcf4 Add tests 5 years ago
Andy Wang 6580e38e44 Introduce a special Session closing frame 5 years ago
Andy Wang c9318dc90b Fix potential deadlocks 5 years ago
Andy Wang 96215f116a Fix #61 5 years ago
Andy Wang 8c477fb2b5 Default StreamTimeout to 300 seconds 5 years ago
Andy Wang 52720ca52f RedirAddr backward compatibility 5 years ago
Andy Wang eec295a00e Remove unnecessary pointer value 5 years ago
Andy Wang 8a6f6b6088 Minor error prompt and listen to :80 and :443 by default 5 years ago
Andy Wang 63f3b4a89f Allow server to listen on multiple ports 5 years ago
Andy Wang e2d4ab7376 Use non-pointer receiver instead 5 years ago
Andy Wang 98b77afb91 websocket over TLS 5 years ago
Andy Wang 854dc422a2 Update some comments 5 years ago
Andy Wang 339b324946 Working direct WebSocket transport 5 years ago
Andy Wang f47f57a59f Direct WebSocket 5 years ago
Andy Wang 3a28bb65d5 Refactor touchStone 5 years ago
Andy Wang a3c3c5dc07 Client side plain websocket 5 years ago
Andy Wang 75dc91c15c Fix wrong wait type 5 years ago
Andy Wang 4861efbc50 Fix #54 5 years ago
Andy Wang 31898dad63 Change the way user termination works 5 years ago
Andy Wang 9dacb9d8fd Handle closing frame properly in datagramBuffer 5 years ago
Andy Wang 3bfaa5c1c1 Receiving a closing frame no longer returns error on Write 5 years ago
Andy Wang 0bc48a5a2e Remove redundant err checking TODO 5 years ago
Andy Wang 3f532ae065 writeFrame returns error 5 years ago
Andy Wang a131af3439 Remove unnecessary Len check 5 years ago
Andy Wang cfa0a97edf Rename a test set 5 years ago
Andy Wang 59f2fe04e3 Use normal Read in ReadTLS instead of ReadFull 5 years ago
Andy Wang 4fb1f55e2d Use 64bit frame Seq to prevent nonce reuse 5 years ago
Andy Wang 2006e5971a Refactor frameSorter and datagramBuffer under one interface 5 years ago
Andy Wang c3ff3f5d1a Fix the weird nil pointer again 5 years ago
Andy Wang bbb0d35e80 Remove conns from map once switchboard.CloseAll is called 5 years ago
Andy Wang 8b99e419b3 Check buffer length for datagramBuffer.Read() in case the datagram is larger than the buffer 5 years ago
Andy Wang 46c02d17f4 Refactor InitState 5 years ago
Andy Wang 87a7684e10 More comments 5 years ago
Andy Wang dd4a1769d0 Refactor new session authorisation 5 years ago
Andy Wang eabe113547 Add Stream Timeout 5 years ago
Andy Wang ba467e8a32 Only store stream in map after Accept 5 years ago
Andy Wang c8184fc1d2 Switch back to juju/ratelimit 5 years ago
Andy Wang cf1f1ccf16 Add some tests 5 years ago
Andy Wang 57255fdeb2 Fail to parse ClientHello if the TLS record layer Content Type and versions are wrong 5 years ago
Andy Wang 0e0a3314c9 Add server TLS parse test 5 years ago
Andy Wang 812ca1af99 Unexport some client.State fields 5 years ago
Andy Wang b98a74f49b Refactor client ClientHello composition 5 years ago
Andy Wang b5c6d7fedc Change touchUp function signature 5 years ago
Andy Wang 52796ad0b1 recvDataFromRemote returns err 5 years ago
Andy Wang c276f504b5 Use ENUM constants for encryption methods 5 years ago
Andy Wang e9a3c29429 Add some tests 5 years ago
Andy Wang e28df86a55 Move Unordered field around 5 years ago
Andy Wang c1b1d5d8ba Fix accidentally removed tx qos 5 years ago
Andy Wang 44a09219f7 Experimental support for UDP 5 years ago
Andy Wang c19c43f6e8 Server side UDP to proxy server 5 years ago
Andy Wang c36ec04ce5 Add unordered mode 5 years ago
Andy Wang 52fac535e3 Fix nil pointer with ClientInfo 5 years ago
Andy Wang 8967819830 Fix accidentally removed tx qos 5 years ago
Qian Wang f65a46f4a9 Remove unnecessary state variable IsAdmin 5 years ago
Qian Wang 58cbb73f0f Refactor return value of decryption 5 years ago
Qian Wang 71e48a1947 Refactor switchboard configuration and add unordered option 5 years ago
Qian Wang cb672a99de Refactor session configuration 5 years ago
Qian Wang abc83a9190 Potential fix to an edge case nil pointer 5 years ago
Qian Wang ea5bb44b0a Add and edit some tests 5 years ago
Qian Wang 82fe177c24 Change how timestamp's validity is checked 5 years ago
Qian Wang fc9f227ccf stream.Write now returns the correct amount of data written 5 years ago
Qian Wang 572fe8486a Rename a variable and modify a test 5 years ago
Qian Wang 586cc5ebb6 Optimise deobfs 5 years ago
Qian Wang e3de2b9852 Fix a potential make len<0 5 years ago
Qian Wang b7549c0664 Fix a potential nil pointer 5 years ago
Qian Wang e244340885 Modify some tests 5 years ago
Qian Wang d99b4009b2 Differentiate concrete types of LimitedValve and UnlimitedValve to avoid unnecessary atomic.AddUint64 since it has non-trivial overhead on embedded systems 5 years ago
Qian Wang e7aa4cd04b Fix a stuck mutex 5 years ago
Qian Wang ae4fc917b6 Let the server send a mock encrypted certificate after ChangeCipherSuite to imitate real behaviour more closely 5 years ago
Qian Wang 81f233c226 Update obfs_test 5 years ago
Qian Wang acb999ee64 Force aead key sizes as 32 bytes due to chacha20-poly1305 5 years ago
Qian Wang 581c2332d1 Fix obfs_test as it wasn't really testing encryptionMethod other than aes-gcm 5 years ago
Qian Wang 1d878b3adb Use AEAD to encrypt session key in ServerHello to provide authentication of the identity of the server 5 years ago
Qian Wang 623ca55ab5 Add ecdh test 5 years ago
Qian Wang 3002c87a49 Fix a server crashing null pointer 5 years ago
Qian Wang e15536d7c7 Refactor TLS handshake 5 years ago
Qian Wang 3dc4c6fb3f Add more trace logs 5 years ago
Qian Wang 01036086c7 Change the frame distribution strategy so that each stream is assigned a fixed underlying TCP connection to send its frames to reduce framesorter ooo count 5 years ago
Qian Wang fac381dbca Refactor switchboard 5 years ago
Qian Wang d46fa74924 Refactor frame sorter 5 years ago
Qian Wang 9fcc328797 Fix a mutex deadlock 5 years ago
Qian Wang 76095bde0f Add user bypass feature 5 years ago
Qian Wang a513663a72 Use a fork of ratelimit for unlimited bucket 5 years ago
Qian Wang 640f81461c Buffer reuse in obfs 5 years ago
Qian Wang 9fa37e327f Use exclusively salsa20 for header encryption 5 years ago
Qian Wang f933c7b453 Move pipe to util 5 years ago
Qian Wang bf83273f6e Fix redirection 5 years ago
Qian Wang 64b39d728f Refactor usedrandom 5 years ago
Qian Wang 08cb5d8462 Refactor usermanager 5 years ago
Qian Wang 67521efbd6 Alter composeServerHello function signature slightly 5 years ago
Qian Wang 57fc31a5fc Add tests 5 years ago
Qian Wang 237b9d131b Add and fix some tests 5 years ago
Qian Wang e0e33e12d6 Fix non random GREASE generation 5 years ago
Qian Wang 05972863b5 Add tests 5 years ago
Qian Wang 53b6b96262 Remove stupid code 5 years ago
Qian Wang 429da0e0d9 Add unit tests 5 years ago
Qian Wang e75c713385 Refactor session struct's obfs fields 5 years ago
Qian Wang 1a628cb524 Refactor client TLS 5 years ago
Qian Wang 33f232475d Improve logging 5 years ago
Qian Wang 726a405a26 TLS1.3 5 years ago
Qian Wang 0684f5df40 Refactor payload cipher 5 years ago
Qian Wang 2735de4f96 Fix bad cryptography 5 years ago
Qian Wang 0fbb6011fc Remove psudorandom padding 5 years ago
Qian Wang 0f3b2232ab Remove redundant config field 5 years ago
Qian Wang e1c879a478 Fix CORS and POST handler 5 years ago
Qian Wang 6af97e2c22 Optimise session closing 5 years ago
Qian Wang 059a222394 Use defer to unlock mutexes 5 years ago
Qian Wang bf8d373f79 Stream optimisations 5 years ago
Qian Wang 0f9830e716 Update test 5 years ago
Qian Wang 73c0b8567e Memory optimisation 5 years ago
Qian Wang 6fc48c5dae Fix a goroutine leak 5 years ago
Qian Wang 1099b558f1 Fix admin mode 5 years ago
Qian Wang 0e08683828 Use a buffered pipe to buffer sorted data 5 years ago
Qian Wang 38f3a4a522 Only start a session after a local connection has been made 5 years ago
Qian Wang 75fecacd20 Change the protocol to solve sessionTicket inconsistency 5 years ago
Qian Wang 592175f73d Close pipe properly 5 years ago
Qian Wang 8f9922b06b Add terminal messages upon session closing 5 years ago
Qian Wang 8ff0f3d17e Rename handlers 5 years ago
Qian Wang 09bdae2584 Add CORS header through middleware 5 years ago
Qian Wang 2ce6f380d1 Implement admin control through a tunneled RESTful API 5 years ago
Qian Wang 98a772b6ee Add server response to status update 5 years ago
Qian Wang 9b552f55a4 Allow an terminal message to be set as a session terminates 5 years ago
Qian Wang 299f08270c make Session implement net.Listener 5 years ago
Qian Wang 29a45bcc1a Rewrite user authentication, credit bookkeeping and db interaction 5 years ago
Qian Wang c88c3d0084 Timeout unused new sessions 5 years ago
Qian Wang 710fa6835a Reduce the size of UID to 16 bytes 5 years ago
Qian Wang d781c7b1be Use a sessional ephemeral key as the main key instead of UID for forward security 5 years ago
Qian Wang ef185b00f0 Solve a data race 5 years ago
Qian Wang 589900fe52 I just did a joint and I need to commit before things go wrong 5 years ago
Qian Wang 00069b7a69 Support Chaha20-Poly1305 5 years ago
Qian Wang 078a382963 Improve the security of header obfuscation 5 years ago
Qian Wang f525643518 Remove debug log 5 years ago
Qian Wang 8168b9e2e7 Use AES-GCM instead of CTR 5 years ago
Qian Wang 0dd52d8570 Add optional encryption 5 years ago
Qian Wang 3e9855191b Cloak 2: generalising cloak as a universal pluggable transport for arbitary proxies 5 years ago
Qian Wang 425dbc4797 Session times out 30s after all streams have been closed 5 years ago
Qian Wang 99afb1a58b Remove ECDH as an external dependancy and include it as a internal package 5 years ago
Qian Wang c44b202c27 Regenerate SessionID on reconnection 5 years ago
Qian Wang 9d2e9be1ef Fix a race which causes the server unable to close all the connections in a session 5 years ago
Qian Wang cb07e446b6 Fix issue which the closing frame padding gets send as acutal data 5 years ago
Qian Wang a52c3204d1 Fix a stuck RWMutex 5 years ago
Qian Wang b522d4a407 Fix constant overflow 5 years ago
Qian Wang 8a10949846 Add unit tests 5 years ago
Qian Wang 46c8bc24de Fix wrapping bug 5 years ago
Qian Wang 9793537034 Faster reconnection 5 years ago
Qian Wang 17d024ac16 Remove reundancy and fix a race 5 years ago
Qian Wang a6e16b4f74 Fix memory leak 5 years ago
Qian Wang 935f995954 Fix a user input validation 5 years ago
Qian Wang 735dc64bd1 Stop using custom conversion function 5 years ago
Qian Wang 41da4102ab Syntax cleanups 5 years ago