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

1445 Commits (c2c833f279631d2400095ea85cec8c44ed6f74b5)

Author SHA1 Message Date
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
liuzheng712 ba8d808cd9 fix(service.sh): annotate django runserver 2016-02-26 23:09:19 +08:00
liuzheng712 d67aab573d fix: ip and port use jumpserver.conf to configure 2016-02-26 22:59:17 +08:00
liuzheng712 5098b1c696 fix(run_websocket.py): remote IP get bug 
when use nginx  self.request.headers.get(X-Real-IP) will get real remote IP,
self.request.remote_ip will get 127.0.0.1 ; if not it will git null, so need to use
self.request.remote_ip for get the ip
 2016-02-26 22:48:07 +08:00
yumaojun 0b9b94bc0b Merge branch 'bug_fix_yu' into dev 
# Conflicts:
#	service.sh
 2016-02-26 15:36:42 +08:00
yumaojun 8aec0c1ac7 fix (install jumpserver): install jumpserver compatible with ubuntu 
1.  install.py  add  platform judge, fix get_ip_addr function
2.  next.py  little adjust
3. service.sh little adjust
 2016-02-26 14:13:21 +08:00
liuzheng712 77f69fbc5e fix(service.sh): annotate django runserver 2016-02-26 11:52:53 +08:00
liuzheng712 14a0c1871f Merge branch 'issue_59_bug_fix' into dev 2016-02-26 10:53:29 +08:00
liuzheng712 49e7796df9 Merge branch 'feat_Only_run_one' into dev 2016-02-26 10:45:40 +08:00
liuzheng712 318a053dbf real ip 2016-02-26 10:38:04 +08:00
ibuler 29953eb7c7 Merge pull request #87 from liuzheng712/feat_run_one 
整合Tornado和Django，修复web阻断功能
 2016-02-26 10:12:23 +08:00
liuzheng712 1816723f16 fix(run_websocket.py): get real ip from headers 2016-02-25 22:43:52 +08:00
liuzheng712 5fb5c1bb40 merge 2016-02-25 21:16:09 +08:00
liuzheng712 4d5d56fe79 fix(jlog/views.py): kill bug, because cross domain 2016-02-25 21:07:18 +08:00
liuzheng712 7213c5c637 fix(log_online.html): log kill bug 
change $.ajax to $.get
 2016-02-25 21:04:27 +08:00
liuzheng712 eb161b978a test kill 2016-02-25 21:00:48 +08:00
liuzheng712 23d4c926b7 web log_kill 2016-02-25 20:45:48 +08:00
liuzheng712 c354b64679 web log_kill 2016-02-25 20:44:13 +08:00
liuzheng712 9c93d5a8d2 add /ws/ 2016-02-25 20:42:35 +08:00
liuzheng712 4f75f76db8 fix: web socket url update 2016-02-25 20:05:20 +08:00
ibuler 4dfef99216 Merge pull request #85 from jumpserver/bug_fix_issue_83 
修复用户禁用后仍可ssh登陆跳板机
 2016-02-25 18:42:59 +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
liuzheng712 92e9f988f3 feat(run_websocket.py): add main function, it need only run run_websocket.py 
I want to run one program at once, open two terminal is ridiculous
 2016-02-25 16:51:41 +08:00
liuzheng712 037a88f0f5 fix(term.js): my mistake 
use yoshiokatsuneo term.js
 2016-02-25 13:58:31 +08:00
yumaojun e8db8addd7 fix (service.sh): ubuntu service.sh 脚本不可用 
由于service.sh 脚本依赖外部的函数库 /etc/init.d/functions, 而ubuntu 和其他一起系统并没有这个文件，所以直接把　这个文件copy 到了当前目录下
不在依赖外部环境。
 2016-02-25 13:26:18 +08:00
ibuler d0ba0503e5 Merge pull request #81 from jumpserver/v3.0_beta_issue_62 
V3.0 beta issue 62 用户下载key后，就删除，为了安全
 2016-02-25 13:15:13 +08:00
liuzheng712 27be35ae77 fix(user_list.html & juser/views.py): only for user delete sshkey when downloaded, add generate butt 
https://github.com/jumpserver/jumpserver/issues/62
 2016-02-25 13:04:09 +08:00
yumaojun 835706f780 fix (jperm.view): 修复回收主机时,　未修改sudoers文件的bug 
1. 恢复ansible 使用的　连接器配置未　smart
2. 修改perm_role_recycle 删除, 添加回收sudo配置.
 2016-02-25 11:59:29 +08:00
ibuler f79675b265 Merge pull request #78 from jumpserver/bug_fix_guang 
#78 统一资产添加文案，修改添加用户流程，修复添加系统用户使用key推送，不生成密码
 2016-02-24 15:06:20 +08:00
ibuler 0a35f757e9 modify(function arg) only for writing style 
修改函数使用kwarg
 2016-02-24 14:46:28 +08:00
liuzheng712 856852592d fix(term.js): CJK support, Copy and Paste support 
Use yoshiokatsuneo's code, fix this bug. His idea is append a textarea and bind all click event on
it. That works for us

https://github.com/jumpserver/jumpserver/issues/59  https://github.com/chjj/term.js/pull/97
 2016-02-24 13:39:00 +08:00
ibuler f60a896926 modify(jasset) 统一管理用户文案 
所有用得到管理用户文案的地，都进行了统一
更改了 管理用户使用默认的对齐
去掉了分隔线
 2016-02-24 12:32:41 +08:00
ibuler b6fc8b777f change(juse) 修改用户添加流程 
1. 添加新用户，不在为该用户设置密码
2. 强制用户使用key登陆跳板机，为了安全性
3. 更改邮件文案和不发送邮件提示文案
 2016-02-24 12:29:47 +08:00
ibuler caefbdc917 fix(juser) 推送系统用户，选择密钥时不为用户生成密码 
当推送系统用户时，选择系统用户使用密钥时没有必要为系统用户生成密码，
以免造成安全上的问题,在代码上也属于冗余.
 2016-02-24 11:34:33 +08:00
yumaojun c6823be302 修复sudo 命令　小写all 引起的推送失败(map) 2016-02-23 23:29:15 +08:00
yumaojun 7bfb1d19fe 修复sudo 命令　小写all 引起的推送失败 2016-02-23 23:04:46 +08:00
yumaojun f24b34758c 修复sudo 命令　小写all 引起的推送失败 2016-02-23 21:14:54 +08:00
ibuler d4b1bdef8e modify(with 0e9a962506) 变更启动脚本 
1. 启动时添加 django crontab
2. 关闭时删除 django crontab
 2016-02-23 18:46:00 +08:00
ibuler dee1d31fc0 change(with 6be7003) 联动改变安装脚本 
1. 为init.sh添加执行权限
2. 统一函数功能  修改其他需要改变权限的脚本或目录
 2016-02-23 18:29:23 +08:00
ibuler 363bce82d8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-02-23 17:49:59 +08:00
ibuler 6be7003ac2 bugfix(登录初始化) 避免登录时ctrl+c进入系统内部 
此bug信息见 #72
1. 修改思路 重命名zzjumpserver.sh，并移动到外层
2. 服务器添加用户时指定shell为 some_dir/jumpserver/init.sh

升级修复方案:
1. 删除/etc/profile.d/zzjumpserver.sh
2. git pull 更新
3. vim编辑 /etc/passwd，把之前建的用户的sh改为 some_dir/jumpserver/init.sh

终
Closes #72
closes #31
 2016-02-23 17:40:33 +08:00
ibuler 586e43c8d0 Merge pull request #71 from jumpserver/dev 
fix(bsd推送系统用户bug)
 2016-02-23 15:50:59 +08:00
ibuler 18e66f52dd Merge remote-tracking branch 'origin/dev' into dev 2016-02-23 15:45:32 +08:00
yumaojun 09e86f0a6b Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2016-02-23 15:22:15 +08:00
yumaojun 3b5daf19c3 １. 修复freebsd 推送带sudo规则的用户时 , sudo　路径引发的问题。 2016-02-23 15:21:27 +08:00
liuzheng712 a037108cf3 refactor: double meaning 2016-02-23 14:23:07 +08:00
liuzheng712 b8a8c3ebf3 feat(juser/views.py;func:down_key): delete the private key when user download it 
issue:62
 2016-02-23 14:15:55 +08:00
ibuler 9fa7f8762e Merge branch 'master' into dev 2016-02-23 13:35:36 +08:00
ibuler 9ec457bf5f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-02-23 13:35:28 +08:00
ibuler 2691cc0b6d Merge branch 'master' into dev 2016-02-23 13:33:32 +08:00