kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
420 Commits 9 Branches 37 Tags 1.4 MiB
Commit Graph

312 Commits

Author SHA1 Message Date
Andy Wang e3552b2afc Refactor server config parser and add tests 2019-12-29 13:28:52 +00:00
notsure2 d35472aea1 Store stream in packet receive path instead of asynchronously to fix https://github.com/cbeuw/Cloak/issues/74 2019-12-14 12:48:45 +00:00
Andy Wang bdd5308169 Code style clean up 2019-11-08 17:06:20 +00:00
Andy Wang 9c30c9b5b5 Add explanations on accepting websocket connections 2019-11-08 16:56:31 +00:00
Andy Wang fbee919f47 Use constants for Closing value 2019-11-03 20:28:43 +00:00
Andy Wang c26be98e79 Use sync.Map in multiplex instead of manual locks 2019-11-03 12:22:12 +00:00
Andy Wang 9cab4670f4 Make buffer close non-blocking 2019-11-02 21:02:35 +00:00
Andy Wang 4c17923717 Make write error close session as well 2019-10-20 15:37:41 +01:00
Andy Wang e2b21dae9f Fix tests 2019-10-20 15:21:31 +01:00
Andy Wang 3649283a49 Fix tests 2019-10-20 15:18:27 +01:00
Andy Wang 57f0c3d20a Close session when one connection drops 2019-10-16 23:00:23 +01:00
Andy Wang 34a4805c34 Add tests 2019-10-16 23:00:11 +01:00
Andy Wang a1b719b15f Add terminal message 2019-10-15 22:24:33 +01:00
Andy Wang beb6568ce0 Check before passive close 2019-10-15 22:06:23 +01:00
Andy Wang 3b3cd277f8 Fix stream not closing 2019-10-15 22:06:11 +01:00
Andy Wang 67159abcf4 Add tests 2019-10-15 21:59:13 +01:00
Andy Wang 6580e38e44 Introduce a special Session closing frame 2019-10-14 15:34:14 +01:00
Andy Wang c9318dc90b Fix potential deadlocks 2019-10-08 23:11:16 +01:00
Andy Wang 96215f116a Fix #61 2019-09-22 10:44:16 +01:00
Andy Wang 8c477fb2b5 Default StreamTimeout to 300 seconds 2019-09-21 16:47:02 +01:00
Andy Wang 52720ca52f RedirAddr backward compatibility 2019-09-21 16:17:43 +01:00
Andy Wang eec295a00e Remove unnecessary pointer value 2019-09-15 21:33:35 +01:00
Andy Wang 8a6f6b6088 Minor error prompt and listen to :80 and :443 by default 2019-09-15 18:11:23 +01:00
Andy Wang 63f3b4a89f Allow server to listen on multiple ports 2019-09-15 15:29:29 +01:00
Andy Wang e2d4ab7376 Use non-pointer receiver instead 2019-09-02 14:04:52 +01:00
Andy Wang 98b77afb91 websocket over TLS 2019-09-02 14:03:10 +01:00
Andy Wang 854dc422a2 Update some comments 2019-09-01 23:14:28 +01:00
Andy Wang 339b324946 Working direct WebSocket transport 2019-09-01 20:23:45 +01:00
Andy Wang f47f57a59f Direct WebSocket 2019-09-01 01:33:34 +01:00
Andy Wang 3a28bb65d5 Refactor touchStone 2019-08-31 21:40:50 +01:00
Andy Wang a3c3c5dc07 Client side plain websocket 2019-08-31 18:01:39 +01:00
Andy Wang 75dc91c15c Fix wrong wait type 2019-08-31 15:33:23 +01:00
Andy Wang 4861efbc50 Fix #54 2019-08-31 15:32:57 +01:00
Andy Wang 31898dad63 Change the way user termination works 2019-08-30 22:14:45 +01:00
Andy Wang 9dacb9d8fd Handle closing frame properly in datagramBuffer 2019-08-30 21:00:15 +01:00
Andy Wang 3bfaa5c1c1 Receiving a closing frame no longer returns error on Write 2019-08-30 20:50:39 +01:00
Andy Wang 0bc48a5a2e Remove redundant err checking TODO 2019-08-30 20:45:06 +01:00
Andy Wang 3f532ae065 writeFrame returns error 2019-08-30 20:43:04 +01:00
Andy Wang a131af3439 Remove unnecessary Len check 2019-08-30 20:39:23 +01:00
Andy Wang cfa0a97edf Rename a test set 2019-08-30 17:07:08 +01:00
Andy Wang 59f2fe04e3 Use normal Read in ReadTLS instead of ReadFull 2019-08-30 14:38:31 +01:00
Andy Wang 4fb1f55e2d Use 64bit frame Seq to prevent nonce reuse 2019-08-27 15:06:28 +01:00
Andy Wang 2006e5971a Refactor frameSorter and datagramBuffer under one interface 2019-08-22 11:48:10 +01:00
Andy Wang c3ff3f5d1a Fix the weird nil pointer again 2019-08-21 13:14:23 +01:00
Andy Wang bbb0d35e80 Remove conns from map once switchboard.CloseAll is called 2019-08-20 23:15:36 +01:00
Andy Wang 8b99e419b3 Check buffer length for datagramBuffer.Read() in case the datagram is larger than the buffer 2019-08-20 22:50:58 +01:00
Andy Wang 46c02d17f4 Refactor InitState 2019-08-20 22:48:01 +01:00
Andy Wang 87a7684e10 More comments 2019-08-20 22:43:04 +01:00
Andy Wang dd4a1769d0 Refactor new session authorisation 2019-08-20 17:35:17 +01:00
Andy Wang eabe113547 Add Stream Timeout 2019-08-19 23:23:41 +01:00
Andy Wang ba467e8a32 Only store stream in map after Accept 2019-08-19 11:31:56 +01:00
Andy Wang c8184fc1d2 Switch back to juju/ratelimit 2019-08-17 11:23:26 +01:00
Andy Wang cf1f1ccf16 Add some tests 2019-08-17 00:59:30 +01:00
Andy Wang 57255fdeb2 Fail to parse ClientHello if the TLS record layer Content Type and versions are wrong 2019-08-17 00:35:28 +01:00
Andy Wang 0e0a3314c9 Add server TLS parse test 2019-08-17 00:32:03 +01:00
Andy Wang 812ca1af99 Unexport some client.State fields 2019-08-17 00:18:19 +01:00
Andy Wang b98a74f49b Refactor client ClientHello composition 2019-08-17 00:16:31 +01:00
Andy Wang b5c6d7fedc Change touchUp function signature 2019-08-16 23:56:46 +01:00
Andy Wang 52796ad0b1 recvDataFromRemote returns err 2019-08-16 23:47:15 +01:00
Andy Wang c276f504b5 Use ENUM constants for encryption methods 2019-08-16 23:44:40 +01:00
Andy Wang e9a3c29429 Add some tests 2019-08-16 23:39:41 +01:00
Andy Wang e28df86a55 Move Unordered field around 2019-08-16 23:20:24 +01:00
Andy Wang c1b1d5d8ba Fix accidentally removed tx qos 2019-08-14 11:56:55 +01:00
Andy Wang 44a09219f7 Experimental support for UDP 2019-08-14 11:56:55 +01:00
Andy Wang c19c43f6e8 Server side UDP to proxy server 2019-08-14 11:56:55 +01:00
Andy Wang c36ec04ce5 Add unordered mode 2019-08-14 11:56:55 +01:00
Andy Wang 52fac535e3 Fix nil pointer with ClientInfo 2019-08-14 11:48:32 +01:00
Andy Wang 8967819830 Fix accidentally removed tx qos 2019-08-14 10:28:08 +01:00
Qian Wang f65a46f4a9 Remove unnecessary state variable IsAdmin 2019-08-12 14:25:24 +01:00
Qian Wang 58cbb73f0f Refactor return value of decryption 2019-08-12 14:21:42 +01:00
Qian Wang 71e48a1947 Refactor switchboard configuration and add unordered option 2019-08-12 00:48:20 +01:00
Qian Wang cb672a99de Refactor session configuration 2019-08-12 00:22:15 +01:00
Qian Wang abc83a9190 Potential fix to an edge case nil pointer 2019-08-09 10:36:27 +01:00
Qian Wang ea5bb44b0a Add and edit some tests 2019-08-08 15:08:16 +01:00
Qian Wang 82fe177c24 Change how timestamp's validity is checked 2019-08-08 15:05:36 +01:00
Qian Wang fc9f227ccf stream.Write now returns the correct amount of data written 2019-08-08 10:56:29 +01:00
Qian Wang 572fe8486a Rename a variable and modify a test 2019-08-07 19:08:37 +01:00
Qian Wang 586cc5ebb6 Optimise deobfs 2019-08-07 17:53:34 +01:00
Qian Wang e3de2b9852 Fix a potential make len<0 2019-08-07 17:22:40 +01:00
Qian Wang b7549c0664 Fix a potential nil pointer 2019-08-07 17:06:48 +01:00
Qian Wang e244340885 Modify some tests 2019-08-07 17:06:31 +01:00
Qian Wang d99b4009b2 Differentiate concrete types of LimitedValve and UnlimitedValve to avoid unnecessary atomic.AddUint64 since it has non-trivial overhead on embedded systems 2019-08-07 15:43:42 +01:00
Qian Wang e7aa4cd04b Fix a stuck mutex 2019-08-07 13:59:27 +01:00
Qian Wang ae4fc917b6 Let the server send a mock encrypted certificate after ChangeCipherSuite to imitate real behaviour more closely 2019-08-07 00:28:08 +01:00
Qian Wang 81f233c226 Update obfs_test 2019-08-07 00:19:30 +01:00
Qian Wang acb999ee64 Force aead key sizes as 32 bytes due to chacha20-poly1305 2019-08-07 00:15:55 +01:00
Qian Wang 581c2332d1 Fix obfs_test as it wasn't really testing encryptionMethod other than aes-gcm 2019-08-07 00:15:12 +01:00
Qian Wang 1d878b3adb Use AEAD to encrypt session key in ServerHello to provide authentication of the identity of the server 2019-08-06 23:59:29 +01:00
Qian Wang 623ca55ab5 Add ecdh test 2019-08-06 23:27:18 +01:00
Qian Wang 3002c87a49 Fix a server crashing null pointer 2019-08-06 21:04:08 +01:00
Qian Wang e15536d7c7 Refactor TLS handshake 2019-08-06 15:50:33 +01:00
Qian Wang 3dc4c6fb3f Add more trace logs 2019-08-06 11:19:47 +01:00
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 2019-08-05 22:14:11 +01:00
Qian Wang fac381dbca Refactor switchboard 2019-08-05 14:33:20 +01:00
Qian Wang d46fa74924 Refactor frame sorter 2019-08-05 13:32:53 +01:00
Qian Wang 9fcc328797 Fix a mutex deadlock 2019-08-05 13:17:02 +01:00
Qian Wang 76095bde0f Add user bypass feature 2019-08-04 21:10:59 +01:00
Qian Wang a513663a72 Use a fork of ratelimit for unlimited bucket 2019-08-04 17:16:18 +01:00
Qian Wang 640f81461c Buffer reuse in obfs 2019-08-04 10:38:49 +01:00
Qian Wang 9fa37e327f Use exclusively salsa20 for header encryption 2019-08-03 22:05:06 +01:00
Qian Wang f933c7b453 Move pipe to util 2019-08-03 15:01:12 +01:00
Qian Wang bf83273f6e Fix redirection 2019-08-03 13:26:57 +01:00
Qian Wang 64b39d728f Refactor usedrandom 2019-08-03 11:49:05 +01:00
Qian Wang 08cb5d8462 Refactor usermanager 2019-08-03 11:17:09 +01:00
Qian Wang 67521efbd6 Alter composeServerHello function signature slightly 2019-08-02 23:37:00 +01:00
Qian Wang 57fc31a5fc Add tests 2019-08-02 23:23:54 +01:00
Qian Wang 237b9d131b Add and fix some tests 2019-08-02 20:50:08 +01:00
Qian Wang e0e33e12d6 Fix non random GREASE generation 2019-08-02 20:06:41 +01:00
Qian Wang 05972863b5 Add tests 2019-08-02 20:06:28 +01:00
Qian Wang 53b6b96262 Remove stupid code 2019-08-02 18:03:08 +01:00
Qian Wang 429da0e0d9 Add unit tests 2019-08-02 18:00:27 +01:00
Qian Wang e75c713385 Refactor session struct's obfs fields 2019-08-02 16:37:48 +01:00
Qian Wang 1a628cb524 Refactor client TLS 2019-08-02 16:02:25 +01:00
Qian Wang 33f232475d Improve logging 2019-08-02 15:45:33 +01:00
Qian Wang 726a405a26 TLS1.3 2019-08-02 01:01:19 +01:00
Qian Wang 0684f5df40 Refactor payload cipher 2019-08-01 00:43:33 +01:00
Qian Wang 2735de4f96 Fix bad cryptography 2019-08-01 00:16:33 +01:00
Qian Wang 0fbb6011fc Remove psudorandom padding 2019-07-31 23:58:15 +01:00
Qian Wang 0f3b2232ab Remove redundant config field 2019-07-31 14:44:34 +01:00
Qian Wang e1c879a478 Fix CORS and POST handler 2019-07-30 23:49:22 +01:00
Qian Wang 6af97e2c22 Optimise session closing 2019-07-28 23:27:59 +01:00
Qian Wang 059a222394 Use defer to unlock mutexes 2019-07-28 12:52:57 +01:00
Qian Wang bf8d373f79 Stream optimisations 2019-07-28 11:58:45 +01:00
Qian Wang 0f9830e716 Update test 2019-07-28 11:06:15 +01:00
Qian Wang 73c0b8567e Memory optimisation 2019-07-28 00:15:27 +01:00
Qian Wang 6fc48c5dae Fix a goroutine leak 2019-07-27 21:38:08 +01:00
Qian Wang 1099b558f1 Fix admin mode 2019-07-27 19:55:53 +01:00
Qian Wang 0e08683828 Use a buffered pipe to buffer sorted data 2019-07-27 19:53:16 +01:00
Qian Wang 38f3a4a522 Only start a session after a local connection has been made 2019-07-26 23:12:38 +01:00
Qian Wang 75fecacd20 Change the protocol to solve sessionTicket inconsistency 2019-07-26 17:05:46 +01:00
Qian Wang 592175f73d Close pipe properly 2019-07-25 22:06:33 +01:00
Qian Wang 8f9922b06b Add terminal messages upon session closing 2019-07-25 20:57:02 +01:00
Qian Wang 8ff0f3d17e Rename handlers 2019-07-25 13:09:36 +01:00
Qian Wang 09bdae2584 Add CORS header through middleware 2019-07-25 13:03:32 +01:00
Qian Wang 2ce6f380d1 Implement admin control through a tunneled RESTful API 2019-07-25 12:17:29 +01:00
Qian Wang 98a772b6ee Add server response to status update 2019-07-24 15:25:09 +01:00
Qian Wang 9b552f55a4 Allow an terminal message to be set as a session terminates 2019-07-24 14:25:57 +01:00
Qian Wang 299f08270c make Session implement net.Listener 2019-07-23 11:06:49 +01:00
Qian Wang 29a45bcc1a Rewrite user authentication, credit bookkeeping and db interaction 2019-07-22 13:42:39 +01:00
Qian Wang c88c3d0084 Timeout unused new sessions 2019-06-16 23:30:35 +10:00
Qian Wang 710fa6835a Reduce the size of UID to 16 bytes 2019-06-16 11:08:51 +10:00
Qian Wang d781c7b1be Use a sessional ephemeral key as the main key instead of UID for forward security 2019-06-16 00:20:55 +10:00
Qian Wang ef185b00f0 Solve a data race 2019-06-15 11:52:46 +10:00
Qian Wang 589900fe52 I just did a joint and I need to commit before things go wrong 2019-06-14 23:08:28 +10:00
Qian Wang 00069b7a69 Support Chaha20-Poly1305 2019-06-14 20:26:26 +10:00
Qian Wang 078a382963 Improve the security of header obfuscation 2019-06-14 19:48:59 +10:00
Qian Wang f525643518 Remove debug log 2019-06-10 00:04:16 +10:00
Qian Wang 8168b9e2e7 Use AES-GCM instead of CTR 2019-06-10 00:03:28 +10:00
Qian Wang 0dd52d8570 Add optional encryption 2019-06-09 21:05:41 +10:00
Qian Wang 3e9855191b Cloak 2: generalising cloak as a universal pluggable transport for arbitary proxies 2019-06-09 16:10:22 +10:00