Commit graph

372 commits

Author SHA1 Message Date
Zou Yong
74f8f8cb85 Add sodium:aes-256-gcm and openssl:ocb AEAD mode (#784)
* Add sodium:aes-256-gcm and openssl:ocb AEAD mode
Use sodium_increment for nonce_increment if avaiable

* Fix pep8

* Fix python3 test code
2017-03-10 17:44:42 +08:00
Zou Yong
d6b40efa5d encrypt.py is renamed to cryptor.py (#780) 2017-03-05 01:09:40 +08:00
Zou Yong
445a3c9c7e Add AEAD ciphers support (#775)
* Add AEAD ciphers support, add manger api

* fix test_encrypt_all

* Add manager api requirements

* #775 fix UDP decrypt_all issue

* fix udp replay: decrypt_all return a list
remove manager api

* fix indent according pep8

* remove abc requirement

* remove unused import

* fix pep8 format

* fix test_aes_256_gcm()
2017-03-04 14:37:29 +08:00
Falseen
e06819c124 add simple ss-tunnel to shadowsocks for dns forward (#759)
* add vscode to .gitignore

* add config.json to gitignore

* add simple ss-tunnel to shadowsocks for dns forward


1.add tunnel.py file to shadowoscks for dns forward (seem ss-tunnel of ss-libev)

2.add add_header to common.py for add socks5 request header

3.add dns_service dns_server dns_server_port dns_server_port dns_local_port to shell.py and config.json

4.update to udprelay for ss-tunnel (dns forward)

5.update to local.py for ss-tunnel

* add config.json.example to shadowsocks

* add tunnel_udp_server.close to local.py and tunnel.py

* fix error about pep8 and  pyflakes for travis

* update rename

rename

add "tunnel_" to dns_service dns_server dns_server_port dns_local_port

* fix tunnel for run tunnel alone

* fix pep8 for travis

* update the config name for tunnel

ord name:
tunnel_service tunnel_dns_server tunnel_dns_server_port tunnel_dns_local_port

new name:
both_tunnel_local tunnel_remote tunnel_remote_port tunnel_port

* update for tunnel

update to local.py shell.py tunnel.py for tunnel

* update pep8 for travis

* update config to _config for tunnel

and fix pep8

* changed "add socks5 header to data" to "add ss header to data"

and changed "remove socks5 header" to "remove ss header"

* add tcp forward to tunnel and fix a bug for pack_addr from common.py

1. update tunnel to tcprelay.py

2. add tunnel_tcp_server to tunnel.py

3. add tunnel_tcp_server to local.py

4. add `address = to_bytes(address)` to `pack_addr` from common.py (fix a error when address is a domain)

* fix pep8 for travis again

* remove ss_header from tcprelay.py and update the "header_length" to udprelay.py

1. Remove unnecessary "add ss_header" from tcprelay.py

2. update "data[7:]" to "data[header_length:]"

* remove "both_tunnel_local" and fix some error for tunnel

* update

* update add_header

* rename is_tunnel to _is_tunnel

https://github.com/shadowsocks/shadowsocks/pull/759
2017-03-02 21:20:04 +08:00
ImPerat0R_
fe13c20dc1 Correct spelling. (#755)
thx
2017-02-28 22:19:36 +08:00
hdl
8ac72b0b25 parse dns_servre in config (#739)
thx
2017-02-28 22:15:47 +08:00
Lution
392e54e508 update regex to support hostnames containing underscore (#694) 2017-01-02 14:56:57 +08:00
Shell.Xu
d31003e9bf new debian package (#659)
* * new upstream version
* change repository.
* change license.
* standards version change to 3.9.8
* fix #810688: man page references texinfo documents which don't exist

* * merge back thomas's change

* * Fix compatible issue (Closes: #845016)
2016-11-20 15:29:11 +08:00
loggerhead
72f1d68a05 Fixed #675 (#676)
* fix a OTA bug

* correct a wrong comment

* ignore emacs autosave files

* keep consistence with the defensive style

* a little refractor

* fix daemon stop failed (#675)

* fix test failed
2016-11-20 14:59:32 +08:00
Shell Chen
5a05312189 Fix method on manager's add command (#578) (#614) 2016-10-11 21:31:41 +08:00
loggerhead
4f28f7c8e4 Fix a OTA bug on _ota_chunk_data (#642)
* fix a OTA bug

* correct a wrong comment
2016-10-10 23:05:20 +08:00
ahxxm
5cd9f04948 Refactor (#615)
* make tcprelay.py less nested

* import traceback module at the top

* make loops in DNSResolver less nested

* make manager.py less nested

* introduce exception_handle decorator

make try/except block more clean

* apply exception_handle decorator to tcprelay

* quote condition judgement

* pep8 fix
2016-10-07 12:30:17 +08:00
mengskysama
5c11527e1b fix ota call write_to_sock multi 2016-09-04 01:18:13 -07:00
v3aqb
56bf81f58a fix ota (#609)(#610) (#610) 2016-09-04 00:05:15 -07:00
smounives
6ef14e56db Add chacha20-ietf crypto (#590)
* Add chacha20-ietf crypto

* fix chacha20-ietf

* PEP8

* Update sodium.py (#1)

pep8
2016-08-17 17:06:54 +08:00
mengskysama
8e8ee5d490 Update tcprelay.py
one time auth fail should be return
2016-07-18 23:31:51 +08:00
mengskysama
f7afcd4df0 add ota help in local 2016-07-18 23:00:00 +08:00
v3aqb
677e6c4c56 fix ota 2016-05-15 01:27:21 +08:00
mengskysama
9844ba9dc7 pep8 2016-04-16 12:19:32 +08:00
mengskysama
f62a550e9f pep8 2016-04-16 12:13:59 +08:00
watermeter
aae990a2fc Add auth method check for TCP socks connections (#528)
* Add auth method check for TCP socks connections

* remove meaningless return at end of function

* remove extra blank lines
2016-04-16 11:54:12 +08:00
htc
b276d52735 Add support for option 'prefer-ipv6' 2016-02-20 11:33:50 +08:00
mengskysama
a8d116d70a fix bug with ord in Py3 2016-01-12 14:20:46 +08:00
mengskysama
811a0e6eb8 PEP8 and undefined name 'gen_key_iv' 2016-01-12 12:17:46 +08:00
mengskysama
269e3dd82d test pass ota in udp 2016-01-12 12:10:40 +08:00
mengskysama
248582c932 remove IPv6 testcase and add ota test 2016-01-12 10:34:48 +08:00
mengskysama
d2f1caeb5d fixbug: when ota disable data not write 2016-01-12 01:03:25 +08:00
jsy
614eed2bf0 PEP8 2016-01-11 23:27:21 +08:00
jsy
7c8ecb811c PEP8 2016-01-11 23:20:12 +08:00
jsy
a4a87eb127 PEP8 2016-01-11 23:18:16 +08:00
jsy
ee391c7773 udp ota bug 2016-01-11 22:58:53 +08:00
jsy
2d40a361db ota config 2016-01-11 18:42:23 +08:00
jsy
569ca0d0a4 reverse config 2016-01-11 18:30:45 +08:00
jsy
28c4d14b12 Merge branch 'feature-ota' 2016-01-11 15:06:59 +08:00
mengskysama
743ddf42d5 Merge pull request #481 from RockerFlower/master
Shadowsocks
2016-01-11 10:30:12 +08:00
jsy
ca99abff89 fix udp ota 2016-01-11 10:26:51 +08:00
jsy
77b2a22055 ota completed! 2016-01-11 10:11:31 +08:00
jsy
767b9217f8 one time auth server side 2015-12-06 02:02:25 +08:00
mengskysama
173323c0f8 Update common.py
https://github.com/mengskysama/shadowsocks-rm/issues/4
2015-11-13 14:29:27 +08:00
mengskysama
0aba0aa40c fix memory leak!
_dns_cache bommmm
2015-10-26 09:45:02 +08:00
mengskysama
4d24b7477a fix bug!
if _last_visits[index] len > 1
2015-10-26 09:43:48 +08:00
mengskysama
6683dfd3bb fix manger bug 2015-10-09 14:49:09 +08:00
李林哲
0c4f79284e allow user to override system dnsserver with config.
config item:
    dns_server     list

    eg:
        dns_server:[8.8.8.8,8.8.4.4]
2015-08-17 09:55:05 +08:00
clowwindy
f19d0ea6fd fix #425 2015-08-15 22:36:29 +08:00
clowwindy
a2bc6e1945 fix #414 2015-08-11 17:55:16 +08:00
clowwindy
a434eef096 fix json decode issue 2015-08-10 11:53:54 +08:00
clowwindy
3c1154923f fix json unicode issue in manager 2015-08-10 00:06:19 +08:00
clowwindy
c8b3f71e1b respond ok to add and remove commands 2015-08-06 19:45:37 +08:00
clowwindy
3576b3006c support IPv6 on control socket 2015-08-06 15:13:29 +08:00
clowwindy
249bcc0b29 refine unit test 2015-08-06 00:52:25 +08:00