github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,593 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

113 Commits (1d14f08541a429396390ceb26453fbe922d102ed)

Author SHA1 Message Date
liuzheng712 f3d863ea45 filename 2016-03-28 20:19:49 +08:00
kelianchun_miller 0707b68796 connect.py use TermLog 2016-03-27 22:00:00 +08:00
kelianchun_miller fd713e0e5c pull issue #120 remove ps1 2016-03-25 21:08:52 +08:00
kelianchun 6d329b130a remove ps1 search 
remove ps1 search
 2016-03-24 13:02:02 +08:00
kelianchun f11016f57c Merge pull request #136 from kelianchun/dev 
pull issue #120
 2016-03-18 23:38:26 +08:00
kelianchun_miller b2ccbc3f9e pull issue #120 2016-03-18 23:36:31 +08:00
kelianchun_miller 7dcf050dc4 pull issue #120 2016-03-18 22:06:40 +08:00
kelianchun_miller 598d6cffa4 pull issue #120 2016-03-18 20:43:25 +08:00
ibuler 3778724b73 Merge pull request #134 from kelianchun/dev 
修复命令截取bug
 2016-03-18 16:46:02 +08:00
kelianchun d76865c1ed pull issue #120 
修复了命令处理的bug
 2016-03-18 15:38:31 +08:00
ibuler a8eb9f3e79 fix(jlog, websocket url) 修复ws使用 ws协议还是wss协议 
1. 不再需要浏览器判断什么协议，需要在jumpserver.conf注明

ref #63
 2016-02-27 00:19:04 +08:00
ibuler a88d8ca410 fix(upload, download, exec, gn) 修复上传下载文件名，上传目录层次，执行命令回车报错，g+不存在id报错 
1. 上传下载文件名 改为 时间+随机4位字母数字
2. 命令回车判断，为空返回
3. g+1判断，不过不存在该组，则返回

close #52
close #93

ref https://github.com/jumpserver/jumpserver/issues/53
ref https://github.com/jumpserver/jumpserver/issues/93
 2016-02-26 23:51:21 +08:00
ibuler 47ce09393c fix(connect.py) 用户禁用后仍可ssh登陆jumpserver 
修改connect.py添加判断
资产禁用还没有考虑，改动太大，留后续版本更改

ref https://github.com/jumpserver/jumpserver/issues/83
 2016-02-25 18:34:46 +08:00
iambocai bob.chen.cs@gmail.com fa195c3808 update for pull#47 2016-02-17 15:16:36 +08:00
iambocai bob.chen.cs@gmail.com 0b79f754f9 1. 当用户未被授予任何角色/主机权限时，提示用户 
2. 根据用户实际安装路径，替换启动脚本中connect.py的路径
3. 修正几处拼写错误
 2016-01-25 18:21:07 +08:00
ibuler b6f82ca020 修复vim修改窗口大小中断bug 2016-01-14 11:10:07 +08:00
ibuler f2487a22cd 修复 su - 无法获取 Env的bug 2016-01-13 17:57:32 +08:00
ibuler 4d0331e105 Update connect.py 2016-01-13 15:51:29 +08:00
Honghui Ding dd36857cf8 Get SSH client IP address 2016-01-09 07:37:28 +00:00
ibuler ea973bbb52 修复交换机小bug 2015-12-31 22:37:01 +08:00
ibuler 5e86b06db8 添加调试 2015-12-31 16:41:52 +08:00
ibuler 6ff030847e Merge branch 'sh1' into sh 2015-12-31 16:18:50 +08:00
ibuler a12e401f15 fix comment 2015-12-31 12:54:15 +08:00
ParInshOvGotQuep 90b875adae 修改普通用户默认shell为connect.py，修复jailbreak 2015-12-30 19:15:33 +08:00
ibuler 2fa1d7a95b fix connect.py 字符报错 2015-12-30 12:36:34 +08:00
chi-chi weng 71116bc525 fix remote ip bug 
fix remote ip bug
 2015-12-23 15:17:14 +08:00
ibuler 08cbaa1622 fix sudo bug 2015-12-20 00:30:31 +08:00
ibuler 39b7a7290f merge with dev 2015-12-19 17:30:21 +08:00
ibuler c103738302 merge with dev 2015-12-19 17:26:34 +08:00
ibuler 5bae8245bd modify source ip bug 2015-06-09 09:32:35 +08:00
何威 6998036bdc 修复当用户使用Ctrl+C结束进程时,没有正确退出 2015-05-22 17:18:37 +08:00
ibuler e09cb10439 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 17:22:26 +08:00
ibuler caa318b808 modify a bug with 10.0.0.1 10.0.0.11 10.0.0.12 match problem 2015-05-18 16:40:36 +08:00
ibuler 00f7346578 resolve connect.py string start with g bug 2015-04-28 16:54:58 +08:00
ibuler c01a489dce modify service.sh bug 2015-04-24 18:19:43 +08:00
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler ea37374ea5 django 1.6 2015-04-20 18:56:30 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler 17e89bb55b ޸һbug 2015-04-19 18:26:38 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
ibuler bcc5774365 ӳɹҳ 2015-04-18 13:52:28 +08:00
guanghongwei 78f00e5c5f ϴļ 2015-04-09 23:49:21 +08:00
guanghongwei ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00
halcyon bb94cfc7a1 完善 2015-04-08 17:31:07 +08:00
guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
 2015-03-21 13:10:38 +08:00
guanghongwei e717fad762 ȵ 2015-03-19 23:57:08 +08:00
halcyon fef224459c 鉴权 2015-03-19 18:32:10 +08:00
root fa0ec1e7d7 connect 2015-03-17 23:20:25 +08:00
halcyon 98dfebc3aa jlog 2015-03-17 17:18:41 +08:00