Permalink
Browse files

merge with dev

1 parent 1387e29 commit c103738302c8b6aa209ece442a29b3e365c98c20 @ibuler ibuler committed Dec 19, 2015
Showing with 4,991 additions and 11,866 deletions.
  1. BIN .DS_Store
  2. +6 −4 .gitignore
  3. +56 −22 README.md
  4. +732 −306 connect.py
  5. +0 −141 docs/AddUserAsset.py
  6. +0 −1 docs/__init__.py
  7. +0 −36 docs/developer_doc.txt
  8. +0 −135 docs/install.py
  9. +0 −9 docs/requirements.txt
  10. +0 −13 docs/zzjumpserver.sh
  11. +82 −25 jasset/models.py
  12. +18 −22 jasset/urls.py
  13. +489 −849 jasset/views.py
  14. +31 −5 jlog/models.py
  15. +6 −6 jlog/urls.py
  16. +103 −67 jlog/views.py
  17. +43 −37 jperm/models.py
  18. +18 −29 jperm/urls.py
  19. +630 −607 jperm/views.py
  20. +11 −16 jumpserver.conf
  21. +310 −234 jumpserver/api.py
  22. +8 −18 jumpserver/context_processors.py
  23. +31 −7 jumpserver/settings.py
  24. +219 −289 jumpserver/templatetags/mytags.py
  25. +15 −17 jumpserver/urls.py
  26. +271 −242 jumpserver/views.py
  27. +33 −20 juser/models.py
  28. +0 −3 juser/tests.py
  29. +20 −28 juser/urls.py
  30. +282 −543 juser/views.py
  31. 0 manage.py
  32. +6 −14 service.sh
  33. BIN static/.DS_Store
  34. +12 −3 static/css/style.css
  35. BIN static/img/root.png
  36. +47 −14 static/js/base.js
  37. +1 −1 static/js/dropzone/dropzone.js
  38. +3 −3 static/js/highcharts/highcharts.src.js
  39. +1 −1 static/js/jquery-ui-1.10.4.min.js
  40. +1 −1 static/js/jquery.colorbox.js
  41. +2 −12 static/js/layer/extend/layer.ext.js
  42. BIN static/js/layer/skin/default/icon_ext.png
  43. BIN static/js/layer/skin/default/textbg.png
  44. BIN static/js/layer/skin/default/xubox_ico0.png
  45. BIN static/js/layer/skin/default/xubox_loading0.gif
  46. BIN static/js/layer/skin/default/xubox_loading1.gif
  47. BIN static/js/layer/skin/default/xubox_loading2.gif
  48. BIN static/js/layer/skin/default/xubox_loading3.gif
  49. BIN static/js/layer/skin/default/xubox_title0.png
  50. +3 −79 static/js/layer/skin/layer.css
  51. +2 −39 static/js/layer/skin/layer.ext.css
  52. +2 −3 templates/base.html
  53. +51 −8 templates/download.html
  54. +11 −10 templates/foot_script.html
  55. +2 −2 templates/footer.html
  56. +1 −0 templates/head_script.html
  57. +345 −192 templates/index.html
  58. +75 −69 templates/index_cu.html
  59. +0 −3 templates/jasset/dept_host_ajax.html
  60. +16 −53 templates/jasset/group_add.html
  61. +0 −203 templates/jasset/group_detail.html
  62. +12 −23 templates/jasset/group_edit.html
  63. +59 −54 templates/jasset/group_list.html
  64. +0 −207 templates/jasset/host_add.html
  65. +0 −68 templates/jasset/host_add_multi.html
  66. +0 −221 templates/jasset/host_detail.html
  67. +0 −228 templates/jasset/host_edit.html
  68. +0 −192 templates/jasset/host_list.html
  69. +0 −172 templates/jasset/host_list_common.html
  70. +0 −177 templates/jasset/host_list_nop.html
  71. +0 −169 templates/jasset/host_search.html
  72. +42 −26 templates/jasset/idc_add.html
  73. +0 −211 templates/jasset/idc_detail.html
  74. +40 −50 templates/jasset/idc_edit.html
  75. +48 −46 templates/jasset/idc_list.html
  76. +0 −10 templates/jasset/jasset.html
  77. +0 −106 templates/jasset/jlist_ip.html
  78. +124 −60 templates/jlog/log_offline.html
  79. +120 −131 templates/jlog/log_online.html
  80. +1 −1 templates/jlog/log_search.html
  81. +1 −1 templates/jlog/user_history.html
  82. +0 −179 templates/jperm/dept_perm_edit.html
  83. +0 −104 templates/jperm/dept_perm_list.html
  84. +0 −176 templates/jperm/perm_add.html
  85. +0 −187 templates/jperm/perm_apply.html
  86. +0 −31 templates/jperm/perm_apply_exec.html
  87. +0 −55 templates/jperm/perm_apply_info.html
  88. +0 −40 templates/jperm/perm_apply_search.html
  89. +0 −61 templates/jperm/perm_asset_detail.html
  90. +0 −118 templates/jperm/perm_detail.html
  91. +0 −130 templates/jperm/perm_edit.html
  92. +0 −138 templates/jperm/perm_edit_bak.html
  93. +0 −108 templates/jperm/perm_list.html
  94. +0 −132 templates/jperm/perm_list_ajax.html
  95. +57 −62 templates/jperm/perm_log.html
  96. +0 −127 templates/jperm/perm_log_offline.html
  97. +0 −128 templates/jperm/perm_log_online.html
  98. +0 −240 templates/jperm/perm_user_detail.html
  99. +0 −226 templates/jperm/sudo_add.html
  100. +0 −148 templates/jperm/sudo_cmd_add.html
  101. +0 −48 templates/jperm/sudo_cmd_detail.html
  102. +0 −140 templates/jperm/sudo_cmd_list.html
  103. +0 −155 templates/jperm/sudo_edit.html
  104. +0 −129 templates/jperm/sudo_list.html
  105. +0 −132 templates/juser/chg_info.html
  106. +0 −133 templates/juser/dept_add.html
  107. +0 −116 templates/juser/dept_detail.html
  108. +0 −133 templates/juser/dept_edit.html
  109. +0 −126 templates/juser/dept_list.html
  110. +0 −3 templates/juser/dept_user_ajax.html
  111. +10 −41 templates/juser/group_add.html
  112. +0 −4 templates/juser/group_add_ajax.html
  113. +1 −1 templates/juser/group_detail.html
  114. +11 −50 templates/juser/group_edit.html
  115. +52 −30 templates/juser/group_list.html
  116. +1 −25 templates/juser/profile.html
  117. +52 −82 templates/juser/user_add.html
  118. +64 −33 templates/juser/user_detail.html
  119. +56 −93 templates/juser/user_edit.html
  120. +76 −61 templates/juser/user_list.html
  121. +1 −1 templates/login.html
  122. +31 −97 templates/nav.html
  123. +2 −54 templates/nav_bar_header.html
  124. +3 −3 templates/nav_cat_bar.html
  125. +14 −9 templates/nav_li_profile.html
  126. +37 −43 templates/paginator.html
  127. +0 −74 templates/test.html
  128. +81 −22 templates/upload.html
  129. +0 −1 version
  130. +0 −17 websocket/.bin/node-tail
  131. +0 −126 websocket/index.js
  132. +0 −888 websocket/npm-debug.log
  133. +0 −12 websocket/package.json
View
Binary file not shown.
View
@@ -1,7 +1,8 @@
*.py[cod]
.idea
test.py
-
+.DS_Store
+db.sqlite3
# C extensions
*.so
@@ -36,8 +37,9 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
-node_modules
-logs
-keys
+*.log
+logs/*
+keys/*
jumpserver.conf
nohup.out
+tmp/*
View
@@ -1,34 +1,68 @@
#欢迎使用Jumpserver
-**Jumpserver**是一款由python编写开源的跳板机(堡垒机)系统,实现了跳板机应有的功能
+**Jumpserver** 是一款由python编写开源的跳板机(堡垒机)系统,实现了跳板机应有的功能
+###截图:
+首页
+
+![webterminal](https://github.com/ibuler/static/raw/master/jumpserver3/index.jpeg)
-> **统计管理** 统一管理用户
->
-> **授权** 授权用户登录特定主机
->
-> **审计** 审计用户操作
->
-> **web管理** 漂亮的web管理界面
+WebTerminal:
-## 主要模块
-#### 用户管理 ####
- 负责用户管理,添加用户,编辑用户,建立部门,建立用户组等
-#### 资产管理 ####
- 负责资产管理,添加资产,编辑资产,建立IDC,建立用户组等
-#### 授权管理 ####
- 负责授权用户登录某些特定主机,授权sudo,查看授权申请
-#### 日志审计 ####
- 负责用户操作的审计,监控用户操作,统计用户操作记录,中断用户操作
-#### 上传下载 ####
- 负责用户文件上传下载
+![webterminal](https://github.com/ibuler/static/raw/master/jumpserver3/webTerminal.gif)
-[官网](http://www.jumpserver.org)
+Web批量执行命令
+
+![WebExecCommand](https://github.com/ibuler/static/raw/master/jumpserver3/webExec.gif)
+
+录像回放
+
+![录像](https://github.com/ibuler/static/raw/master/jumpserver3/record.gif)
+
+跳转和批量命令
+
+![跳转](https://github.com/ibuler/static/raw/master/jumpserver3/connect.gif)
+
+命令统计
+
+![跳转](https://github.com/ibuler/static/raw/master/jumpserver3/command.png)
+
+### 文档
+
+* [访问wiki](https://github.com/ibuler/jumpserver/wiki)
+* [快速安装](https://github.com/ibuler/jumpserver/wiki/快速安装)
+* [名词解释](https://github.com/ibuler/jumpserver/wiki/名称解释)
+* [快速开始](https://github.com/ibuler/jumpserver/wiki/快速开始)
+
+### 特点
+
+* 完全真开源,GPL授权
+* Python编写,容易再次开发
+* 实现了跳板机基本功能,认证、授权、审计
+* 集成了Ansible,批量命令等
+* 支持WebTerminal
+* Bootstrap编写,界面美观
+* 自动收集硬件信息
+* 录像回放
+* 命令搜索
+* 实时监控
+* 批量上传下载
+
+### 其它
+
+[Jumpserver官网](http://www.jumpserver.org)
[demo站点](http://demo.jumpserver.org)
-[更新log](http://laoguang.blog.51cto.com/6013350/1635853)
+### 团队
+
+* **广宏伟** ibuler
+* **王墉** halcyon
+* **陈尚委** 假想控
+* **喻茂峻** 紫川秀
+* **刘正** evanescunt
+* **柯连春** 遍地节操
+
-[部署文档](http://laoguang.blog.51cto.com/6013350/1636273)
Oops, something went wrong.

0 comments on commit c103738

Please sign in to comment.