Commit Graph

888 Commits

Author SHA1 Message Date
yumaojun
39a0350e08 1. 完成Sudo 规则的 角色授权
2. 角色详情里面 新增 推送详情
3. 角色推送 支持计算与叠加
2015-11-28 19:33:21 +08:00
yumaojun
951467f8ca 1. 新增 PermPush表, 用于记录角色的推送记录
2. 角色权限 以来 sudo 完成。
2015-11-26 17:23:16 +08:00
yumaojun
1a0c9cd4e6 1. 新增 PermSudo表, 用于记录 sudo别名
2. 实现Sudo表对应的 添加,显示,更新,删除页面
3. 添加角色时,需要选择对应的 sudo别名
2015-11-24 22:03:58 +08:00
yumaojun
e57c6a9d2e 1. 在授权规则添加页面 通过js 给予用户输入提醒 2015-11-20 14:03:05 +08:00
yumaojun
6582ee1624 1. 更新 和 添加 (role 和 rule )操作 以 msg 的方式 刷新页面 2015-11-18 22:32:21 +08:00
yumaojun
04e7073aca 1. fixed ansible api auto load local host file (/etc/ansible/hosts) bug with null list 2015-11-18 19:03:13 +08:00
yumaojun
2ccd072416 1. delete role filed : is_screty_key
2. rule edit page  add selected mark
3. role add page  consider user use_default_auth attribute
4. role password use jumpserver api CRYPTO to crypt
5. fixed ansible api auto load local host file (/etc/ansible/hosts) bug
6. ansible api command and task  interface add pattern  default argument( pattern='*')
2015-11-18 17:16:29 +08:00
yumaojun
e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
liuzheng712
1c3b66c1a8 user.update 2015-11-17 11:13:52 +08:00
liuzheng712
a99f024dfc user.update 2015-11-17 11:07:40 +08:00
liuzheng712
738c6353ef user.update 2015-11-17 10:44:34 +08:00
liuzheng712
adf20f188e user.update 2015-11-17 10:16:51 +08:00
liuzheng712
b9b965753b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ 2015-11-17 09:53:48 +08:00
liuzheng712
036873e129 merge_dev 2015-11-17 09:53:43 +08:00
ibuler
ce02d430ba deal_command添加到静态方法中 2015-11-16 23:33:44 +08:00
ibuler
4abf2b06d8 添加jumpserver.conf 2015-11-16 23:11:37 +08:00
ibuler
2d27e3fee0 恢复修改前 2015-11-16 22:46:36 +08:00
ibuler
67771105ae key目录变化 2015-11-16 22:45:41 +08:00
liuzheng712
de9ce6dd19 select all 2015-11-16 22:28:02 +08:00
ibuler
71ef4b079a Merge branch 'dev' of git.coding.net:jumpserver/Jumpserver into dev 2015-11-16 18:35:31 +08:00
ibuler
f0d901e136 修复分页bug 2015-11-16 18:34:51 +08:00
liuzheng712
d3dd9d94d3 update 2015-11-16 14:59:26 +08:00
liuzheng712
2938f7e506 update 2015-11-16 14:30:10 +08:00
liuzheng712
1f5fa9a9bd merge 2015-11-16 14:21:21 +08:00
liuzheng712
96ac65b346 udpate 2015-11-16 14:09:02 +08:00
yumaojun
c00e4c24a3 app jperm role and rule bug fixed... 2015-11-16 13:49:39 +08:00
yumaojun
844fe2c250 add asset ok ,pull 2015-11-15 23:43:19 +08:00
yumaojun
6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
wangyong
1e41b79611 fix merge bug 2015-11-15 23:29:31 +08:00
ibuler
5d33493233 asset js 2015-11-15 23:21:59 +08:00
ibuler
38c65dbea8 暂时去掉普通用户的get.asset 2015-11-15 23:19:50 +08:00
yumaojun
218ba0d189 merge ... 2015-11-15 22:20:19 +08:00
yumaojun
a36294a529 new map 2015-11-15 22:12:28 +08:00
广宏伟
333ee713d4 解决分页bug,和random_pass 2015-11-15 18:20:34 +08:00
广宏伟
b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
ibuler
3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
yumaojun
8b94833ea0 1. role push function use password and public key completed 2015-11-15 12:38:57 +08:00
yumaojun
0862ffef98 merge map 2015-11-15 08:39:43 +08:00
yumaojun
95dc12a71b update models 2015-11-14 23:17:05 +08:00
wangyong
0f29745bfa asset add batch 2015-11-14 23:09:13 +08:00
yumaojun
012950cb68 merge update... 2015-11-14 23:07:08 +08:00
ibuler
f9c06c22ae 修改变量命名 2015-11-14 22:57:34 +08:00
yumaojun
83c2704d53 1. update role push 2015-11-14 22:54:29 +08:00
yumaojun
74b6b4dea2 1. rule push page completed 2015-11-14 21:52:09 +08:00
yumaojun
f6bc03324f 1. rule operations list add delete edit info page compeleted
2. rule operations list add delete edit info page compeleted
2015-11-14 21:13:02 +08:00
kelianchun_miller
3d4443e1b0 update connect.py
命令处理进一步处理
2015-11-14 11:45:56 +08:00
kelianchun_miller
366a5d5737 update connect.py 2015-11-14 11:24:31 +08:00
yumaojun
6d5d279f61 1. 增加授权规则的添加,删除,编辑,详情页面。
2. 修改nav.html中关于授权部分页面。
3. 修改Jasset APP 下的 view,使得数据库中存储的密码是明文。
2015-11-14 10:16:48 +08:00
ibuler
20970db404 修复环境变量大小写,修改terminal类 2015-11-13 21:15:41 +08:00
yumaojun
1eff4ab4ff add edit, detail page 2015-11-13 17:17:22 +08:00