dnomd343
/
shadowsocksr
mirror of https://github.com/dnomd343/shadowsocksr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix mysql update BUG 

hot update mysql connection info
more tls1.2 info for debugging
dev
BreakWa11 9 years ago
parent
9f4f42eefd
commit
b8feaacbbb
3 changed files with 20 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Config.py
  2. 5
      db_transfer.py
  3. 26
      shadowsocks/obfsplugin/obfs_tls.py

1
Config.py
View File

@ -5,6 +5,7 @@ MYSQL_USER = 'ss'
MYSQL_PASS = 'ss' MYSQL_PASS = 'ss'
MYSQL_DB = 'shadowsocks' MYSQL_DB = 'shadowsocks'
MYSQL_TRANSFER_MUL = 1.0 MYSQL_TRANSFER_MUL = 1.0
MYSQL_UPDATE_TIME = 15
MANAGE_PASS = 'ss233333333' MANAGE_PASS = 'ss233333333'
#if you want manage in other server you should set this value to global ip #if you want manage in other server you should set this value to global ip

5
db_transfer.py
View File

@ -50,7 +50,6 @@ class DbTransfer(object):
dt_transfer[id] = [int(curr_transfer[id][0] * Config.MYSQL_TRANSFER_MUL), dt_transfer[id] = [int(curr_transfer[id][0] * Config.MYSQL_TRANSFER_MUL),
int(curr_transfer[id][1] * Config.MYSQL_TRANSFER_MUL)] int(curr_transfer[id][1] * Config.MYSQL_TRANSFER_MUL)]
self.last_get_transfer = curr_transfer
query_head = 'UPDATE user' query_head = 'UPDATE user'
query_sub_when = '' query_sub_when = ''
query_sub_when2 = '' query_sub_when2 = ''
@ -79,6 +78,7 @@ class DbTransfer(object):
cur.close() cur.close()
conn.commit() conn.commit()
conn.close() conn.close()
self.last_get_transfer = curr_transfer
@staticmethod @staticmethod
def pull_db_all_user(): def pull_db_all_user():
@ -170,6 +170,7 @@ class DbTransfer(object):
last_rows = [] last_rows = []
try: try:
while True: while True:
reload(Config)
try: try:
DbTransfer.get_instance().push_db_all_user() DbTransfer.get_instance().push_db_all_user()
rows = DbTransfer.get_instance().pull_db_all_user() rows = DbTransfer.get_instance().pull_db_all_user()
@ -179,7 +180,7 @@ class DbTransfer(object):
trace = traceback.format_exc() trace = traceback.format_exc()
logging.error(trace) logging.error(trace)
#logging.warn('db thread except:%s' % e) #logging.warn('db thread except:%s' % e)
if DbTransfer.get_instance().event.wait(15): if DbTransfer.get_instance().event.wait(Config.MYSQL_UPDATE_TIME):
break break
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
pass pass

26
shadowsocks/obfsplugin/obfs_tls.py
View File

@ -251,7 +251,7 @@ class tls_auth(plain.plain):
buf = buf[32:] buf = buf[32:]
sessionid_len = ord(buf[0]) sessionid_len = ord(buf[0])
if sessionid_len < 32: if sessionid_len < 32:
logging.error("tls_auth wrong sessionid_len") logging.info("tls_auth wrong sessionid_len")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
sessionid = buf[1:sessionid_len + 1] sessionid = buf[1:sessionid_len + 1]
buf = buf[sessionid_len+1:] buf = buf[sessionid_len+1:]
@ -261,13 +261,13 @@ class tls_auth(plain.plain):
time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time) time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time)
if time_dif < -self.max_time_dif or time_dif > self.max_time_dif \ if time_dif < -self.max_time_dif or time_dif > self.max_time_dif \
or common.int32(utc_time - self.server_info.data.startup_time) < -self.max_time_dif / 2: or common.int32(utc_time - self.server_info.data.startup_time) < -self.max_time_dif / 2:
logging.debug("tls_auth wrong time") logging.info("tls_auth wrong time")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
if sha1 != verifyid[22:]: if sha1 != verifyid[22:]:
logging.debug("tls_auth wrong sha1") logging.info("tls_auth wrong sha1")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
if self.server_info.data.client_data.get(verifyid[:22]): if self.server_info.data.client_data.get(verifyid[:22]):
logging.error("replay attack detect, id = %s" % (binascii.hexlify(verifyid))) logging.info("replay attack detect, id = %s" % (binascii.hexlify(verifyid)))
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
self.server_info.data.client_data.sweep() self.server_info.data.client_data.sweep()
self.server_info.data.client_data[verifyid[:22]] = sessionid self.server_info.data.client_data[verifyid[:22]] = sessionid
@ -344,7 +344,7 @@ class tls_ticket_auth(plain.plain):
self.recv_buffer += buf self.recv_buffer += buf
while len(self.recv_buffer) > 5: while len(self.recv_buffer) > 5:
if ord(self.recv_buffer[0]) != 0x17: if ord(self.recv_buffer[0]) != 0x17:
logging.error("data = %s" % (binascii.hexlify(self.recv_buffer))) logging.info("data = %s" % (binascii.hexlify(self.recv_buffer)))
raise Exception('server_decode appdata error') raise Exception('server_decode appdata error')
size = struct.unpack('>H', self.recv_buffer[3:5])[0] size = struct.unpack('>H', self.recv_buffer[3:5])[0]
if len(self.recv_buffer) < size + 5: if len(self.recv_buffer) < size + 5:
@ -396,7 +396,7 @@ class tls_ticket_auth(plain.plain):
self.recv_buffer += buf self.recv_buffer += buf
while len(self.recv_buffer) > 5: while len(self.recv_buffer) > 5:
if ord(self.recv_buffer[0]) != 0x17: if ord(self.recv_buffer[0]) != 0x17:
logging.error("data = %s" % (binascii.hexlify(self.recv_buffer))) logging.info("data = %s" % (binascii.hexlify(self.recv_buffer)))
raise Exception('server_decode appdata error') raise Exception('server_decode appdata error')
size = struct.unpack('>H', self.recv_buffer[3:5])[0] size = struct.unpack('>H', self.recv_buffer[3:5])[0]
if len(self.recv_buffer) < size + 5: if len(self.recv_buffer) < size + 5:
@ -423,28 +423,34 @@ class tls_ticket_auth(plain.plain):
self.handshake_status = 8 self.handshake_status = 8
return self.server_decode(b'') return self.server_decode(b'')
#raise Exception("handshake data = %s" % (binascii.hexlify(buf)))
self.handshake_status = 2 self.handshake_status = 2
ogn_buf = buf ogn_buf = buf
if not match_begin(buf, b'\x16\x03\x01'): if not match_begin(buf, b'\x16\x03\x01'):
logging.info("tls_auth wrong tls head")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
buf = buf[3:] buf = buf[3:]
if struct.unpack('>H', buf[:2])[0] != len(buf) - 2: if struct.unpack('>H', buf[:2])[0] != len(buf) - 2:
logging.info("tls_auth wrong tls head size")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
buf = buf[2:] buf = buf[2:]
if not match_begin(buf, b'\x01\x00'): #client hello if not match_begin(buf, b'\x01\x00'): #client hello
logging.info("tls_auth not client hello message")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
buf = buf[2:] buf = buf[2:]
if struct.unpack('>H', buf[:2])[0] != len(buf) - 2: if struct.unpack('>H', buf[:2])[0] != len(buf) - 2:
logging.info("tls_auth wrong message size")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
buf = buf[2:] buf = buf[2:]
if not match_begin(buf, self.tls_version): if not match_begin(buf, self.tls_version):
logging.info("tls_auth wrong tls version")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
buf = buf[2:] buf = buf[2:]
verifyid = buf[:32] verifyid = buf[:32]
buf = buf[32:] buf = buf[32:]
sessionid_len = ord(buf[0]) sessionid_len = ord(buf[0])
if sessionid_len < 32: if sessionid_len < 32:
logging.error("tls_auth wrong sessionid_len") logging.info("tls_auth wrong sessionid_len")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
sessionid = buf[1:sessionid_len + 1] sessionid = buf[1:sessionid_len + 1]
buf = buf[sessionid_len+1:] buf = buf[sessionid_len+1:]
@ -454,13 +460,13 @@ class tls_ticket_auth(plain.plain):
time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time) time_dif = common.int32((int(time.time()) & 0xffffffff) - utc_time)
if time_dif < -self.max_time_dif or time_dif > self.max_time_dif \ if time_dif < -self.max_time_dif or time_dif > self.max_time_dif \
or common.int32(utc_time - self.server_info.data.startup_time) < -self.max_time_dif / 2: or common.int32(utc_time - self.server_info.data.startup_time) < -self.max_time_dif / 2:
logging.debug("tls_auth wrong time") logging.info("tls_auth wrong time")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
if sha1 != verifyid[22:]: if sha1 != verifyid[22:]:
logging.debug("tls_auth wrong sha1") logging.info("tls_auth wrong sha1")
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
if self.server_info.data.client_data.get(verifyid[:22]): if self.server_info.data.client_data.get(verifyid[:22]):
logging.error("replay attack detect, id = %s" % (binascii.hexlify(verifyid))) logging.info("replay attack detect, id = %s" % (binascii.hexlify(verifyid)))
return self.decode_error_return(ogn_buf) return self.decode_error_return(ogn_buf)
self.server_info.data.client_data.sweep() self.server_info.data.client_data.sweep()
self.server_info.data.client_data[verifyid[:22]] = sessionid self.server_info.data.client_data[verifyid[:22]] = sessionid

Write Preview
Loading…
Cancel
Save