Archives/Cloak
2
0
Fork 0
mirror of https://github.com/cbeuw/Cloak.git synced 2024-11-11 13:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
566 Commits 6 Branches 35 Tags 1.3 MiB
0473d71bea
Commit Graph

245 Commits

Author SHA1 Message Date
Andy Wang
99fa812594 Fix pickRandConn bad loop 2020-01-22 22:17:18 +00:00
Andy Wang
3f5fdae284 Close session immediately after receiving signal 2020-01-22 21:30:30 +00:00
Andy Wang
d65aee725a Improve stream closing logic and add tests 2020-01-22 21:12:32 +00:00
Andy Wang
e7e4cd5726 Refactor frame reception processor 2020-01-09 10:22:40 +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
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
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
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
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
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
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
87a7684e10 More comments 2019-08-20 22:43:04 +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
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
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
8967819830 Fix accidentally removed tx qos 2019-08-14 10:28:08 +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
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
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
3002c87a49 Fix a server crashing null pointer 2019-08-06 21:04:08 +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
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
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
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
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
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
0e08683828 Use a buffered pipe to buffer sorted data 2019-07-27 19:53:16 +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
2ce6f380d1 Implement admin control through a tunneled RESTful API 2019-07-25 12:17:29 +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
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
Qian Wang
425dbc4797 Session times out 30s after all streams have been closed 2019-03-23 23:45:12 +11:00
Qian Wang
9d2e9be1ef Fix a race which causes the server unable to close all the connections in a session 2019-01-22 00:03:38 +00:00
Qian Wang
cb07e446b6 Fix issue which the closing frame padding gets send as acutal data 2019-01-21 21:15:18 +00:00
Qian Wang
a52c3204d1 Fix a stuck RWMutex 2019-01-21 21:13:54 +00:00
Qian Wang
b522d4a407 Fix constant overflow 2019-01-21 11:42:27 +00:00
Qian Wang
8a10949846 Add unit tests 2019-01-20 23:47:10 +00:00
Qian Wang
46c8bc24de Fix wrapping bug 2019-01-20 17:23:45 +00:00
Qian Wang
9793537034 Faster reconnection 2019-01-20 12:13:29 +00:00
Qian Wang
a6e16b4f74 Fix memory leak 2019-01-19 19:30:00 +00:00
Qian Wang
41da4102ab Syntax cleanups 2019-01-13 21:43:50 +00:00
Qian Wang
24cdf274dd Change the stream header format and reduce overhead 2019-01-13 21:28:57 +00:00
Qian Wang
f4a1c21c2c Birng back sequence wrapping 2019-01-13 19:06:12 +00:00
Qian Wang
0544364a8e Cleanup logs 2019-01-12 15:51:20 +00:00
Qian Wang
310ce1643a Minor Makefile edit and remove FIXME 2019-01-12 14:16:31 +00:00
Qian Wang
d906541497 Redo the header obfuscation. Fix hiccups caused by short packets 2019-01-06 01:40:27 +00:00
Qian Wang
fb12f096d1 Abandon the frameSeq wrapping 2019-01-06 01:39:55 +00:00
Qian Wang
f3f3042c81 Remove redundant functions 2018-12-31 11:30:39 +00:00
Qian Wang
23a06c6a52 Clarify the code to enter admin mode 2018-12-30 01:15:46 +00:00
Qian Wang
1cb7bff8b3 Lexical changes 2018-12-30 00:28:38 +00:00
Qian Wang
e31aef3030 Stop repetitive closing 2018-12-29 00:02:59 +00:00
Qian Wang
4b6ab1b4d5 Finish the admin control 2018-12-26 00:46:39 +00:00
Qian Wang
73aefdeeeb Done some TODOs 2018-12-22 23:58:03 +00:00
Qian Wang
36a743c3ca Client using AdminUID can now use the proxy without adding themselves to the db 2018-12-11 23:26:05 +00:00
Qian Wang
ed1253ff4c Refactor MakeObfs and MakeDeobfs 2018-12-09 23:45:06 +00:00
Qian Wang
2688e30907 Inline formatting 2018-12-03 20:33:14 +00:00
Qian Wang
306385f9c2 Uncomment header obfuscation 2018-11-24 01:24:47 +00:00
Qian Wang
239647c5b2 Fix a race, some cleanup 2018-11-24 00:55:26 +00:00
Qian Wang
3b656c9360 Use sync.Once to close die ch 2018-11-23 23:57:35 +00:00
Qian Wang
c4048dccea Basic remote control 2018-11-22 21:55:23 +00:00
Qian Wang
0702e37391 Syncing in-memory credit with db regularly 2018-11-11 19:30:40 +00:00
Qian Wang
3534d05055 QOS and user managing, bug fixes 2018-11-07 21:16:13 +00:00
Qian Wang
6a6b293164 Add bandwidth limiter 2018-10-28 22:51:00 +00:00
Qian Wang
f476650953 Rework switchboard dispatch 2018-10-28 21:22:38 +00:00
Qian Wang
9e4aedbdc1 Stream closing is now ordered 2018-10-27 23:35:46 +01:00
Qian Wang
077eb16dba Fix goroutine leak 2018-10-27 15:27:43 +01:00
Qian Wang
0db52a8a26 General improvements 2018-10-23 20:47:58 +01:00
Qian Wang
3f7eef98e3 drop aes encryption of headers 2018-10-20 21:41:01 +01:00
Qian Wang
bd69784443 optimisations 2018-10-20 17:03:39 +01:00
Qian Wang
7487600434 Mostly works 2018-10-20 11:35:50 +01:00
Qian Wang
02fa072964 Fix infinite loop. Baseline 2018-10-16 21:13:19 +01:00
Qian Wang
a8786a5576 Use ECDH instead of ECIES 2018-10-14 20:32:54 +01:00
Qian Wang
b9f2aa4ed0 Barely working 2018-10-09 21:53:55 +01:00
Qian Wang
3fd7e01566 Untested client 2018-10-07 18:09:45 +01:00
Qian Wang
44d2c0e073 Multiplex initial commit 2018-10-05 23:44:20 +01:00