Skip to content

J
jumpserver
Commit 02ef9c68 authored by ibuler's avatar ibuler
Browse files
Options

Merge remote-tracking branch 'origin/master' 

Conflicts:
	jumpserver/urls.py
	templates/nav.html
parents a184ae98 7a86ba0b
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 21 deletions
connect.py
View file @ 02ef9c68
......@@ -341,14 +341,14 @@ def connect(username, password, host, port, login_name):
def remote_exec_cmd(ip, port, username, password, cmd):
try:
time.sleep(3)
time.sleep(5)
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
ssh.connect(ip, port, username, password, key_filename=USER_KEY_FILE, timeout=5)
stdin, stdout, stderr = ssh.exec_command("bash -l -c '%s'" % cmd)
out = stdout.readlines()
err = stderr.readlines()
color_print('%s:', 'blue')
color_print('%s:' %ip, 'blue')
for i in out:
color_print(" " * 4 + i.strip(), 'green')
for j in err:
......@@ -360,7 +360,7 @@ def remote_exec_cmd(ip, port, username, password, cmd):
def multi_remote_exec_cmd(hosts, username, cmd):
pool = Pool(processes=3)
pool = Pool(processes=5)
for host in hosts:
username, password, ip, port = get_connect_item(username, host)
pool.apply_async(remote_exec_cmd, (ip, port, username, password, cmd))
......
jasset/urls.py 0 → 100644
View file @ 02ef9c68
# coding:utf-8
from django.conf.urls import patterns, include, url
from jasset.views import *
urlpatterns = patterns('',
url(r'^$', index),
url(r'jadd', jadd),
)
\ No newline at end of file
jasset/views.py
View file @ 02ef9c68
#coding:utf-8
from django.shortcuts import render
from django.http import HttpResponse
from django.template import RequestContext
from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect
# Create your views here.
def index(request):
return render_to_response('jasset/jasset.html',)
def jadd(request):
if request.method == 'POST':
pass
return render_to_response('jasset/jadd.html',)
\ No newline at end of file
jumpserver/urls.py
View file @ 02ef9c68
from django.conf.urls import patterns, include, url
from django.contrib import admin
from jumpserver import views
urlpatterns = patterns('',
# Examples:
......@@ -8,4 +7,5 @@ urlpatterns = patterns('',
# url(r'^blog/', include('blog.urls')),
(r'^user/', include('juser.urls')),
url(r'^jasset/', include('jasset.urls')),
)
templates/base.html
View file @ 02ef9c68
......@@ -21,7 +21,7 @@
<div class="row border-bottom">
{% include 'nav_bar_header.html' %}
</div>
{{ content }}
{% block content %}{% endblock %}
{% include 'footer.html' %}
</div>
</div>
......
templates/jasset/jadd.html 0 → 100644
View file @ 02ef9c68
{% extends 'base.html' %}
{% block content %}
<h1>添加主机</h1>
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>请在以下填写主机详细信息</h5>
</div>
<div class="ibox-content">
<form method="get" class="form-horizontal">
<div class="form-group"><label class="col-sm-2 control-label">IP地址</label>
<div class="col-sm-10"><input type="text" placeholder="192.168.1.1" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label">端口号</label>
<div class="col-sm-10"><input type="text" placeholder="22" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 登录方式 </label>
<div class="col-sm-10">
<div class="radio i-checks"><label> <input type="radio" checked="" value="option1" name="a" onclick="show(this)"> <i> LDAP </i></label></div>
<div class="radio i-checks"><label> <input type="radio" value="option2" name="a" onclick="show(this)"> <i> SSH_KEY </i></label></div>
<div class="radio i-checks"><label> <input type="radio" value="option3" name="a" onclick="show(this)"> <i> SSH_PASSWORD </i></label></div>
<div class="radio i-checks"><label> <input type="radio" value="option4" name="a" onclick="show(this)"> <i> JUMPSER_MAP </i></label></div>
</div>
<div name="a1" id=a1 style="display:none;">
<div class="form-group"><label class="col-sm-2 col-sm-offset-1 control-label"> 普通用户名 </label>
<div class="col-sm-8"><input type="text" placeholder="lilei" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 col-sm-offset-1 control-label"> 普通用户密码 </label>
<div class="col-sm-8"><input type="password" placeholder="Password" class="form-control" name="password"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 col-sm-offset-1 control-label"> 超管用户名 </label>
<div class="col-sm-8"><input type="text" placeholder="root" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 col-sm-offset-1 control-label"> 超管用户密码 </label>
<div class="col-sm-8"><input type="password" placeholder="Password" class="form-control" name="password"></div>
</div>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 所属IDC </label>
<div class="col-sm-10"><input type="text" placeholder="北京联通" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 所属业务组 </label>
<div class="col-sm-10"><input type="text" placeholder="数据库" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 是否激活 </label>
<div class="col-sm-10">
<div class="radio i-checks"><label> <input type="radio" checked="" value="o1" name="b"> <i> 激活 </i></label></div>
<div class="radio i-checks"><label> <input type="radio" value="o2" name="b"> <i> 禁用 </i></label></div>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 密码 </label>
<div class="col-sm-10"><input type="password" placeholder="Password" class="form-control" name="password"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-2 control-label"> 备注 </label>
<div class="col-sm-10"><input type="text" placeholder="hadoop01" class="form-control"></div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<div class="col-sm-4 col-sm-offset-5">
<button class="btn btn-white" type="submit"> 重置 </button>
<button class="btn btn-primary" type="submit"> 提交 </button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<script>
var showFlag={};
function show(o){
showFlag[o.name]=o.value;
if(showFlag.a=="option4"){
document.getElementById("a1").style.display="";
}
else{
document.getElementById("a1").style.display="none";
}};
</script>
{% endblock %}
\ No newline at end of file
templates/jasset/jasset.html 0 → 100644
View file @ 02ef9c68
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8">
<title>资产管理</title>
</head>
<body>
<h1>welocome!</h1>
</body>
</html>
\ No newline at end of file
templates/nav.html
View file @ 02ef9c68
......@@ -15,35 +15,35 @@
<li>
<a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/user/show_user/">查看用户</a></li>
<li><a href="/user/add_user/">添加用户</a></li>
<li><a href="/user/show_idc/">查看属组</a></li>
<li><a href="/group/add_group/">添加属组</a></li>
<li><a href="/user/showlist/">查看用户</a></li>
<li><a href="/user/add/">添加用户</a></li>
<li><a href="/group/showlist/">查看属组</a></li>
<li><a href="/group/add/">添加属组</a></li>
</ul>
</li>
<li>
<a href="mailbox.html"><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/asset/show_asset/">查看资产</a></li>
<li><a href="/asset/add_asset/">添加资产</a></li>
<li><a href="/asset/show_idc/">查看机房</a></li>
<li><a href="/asset/add_idc/">添加机房</a></li>
<li><a href="/asset/showlist/">查看资产</a></li>
<li><a href="/jasset/jadd/">添加资产</a></li>
<li><a href="/idc/showlist/">查看机房</a></li>
<li><a href="/idc/add/">添加机房</a></li>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-edit"></i> <span class="nav-label">授权管理</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/perm/show_perm/">查看授权</a></li>
<li><a href="/perm/add_perm/">添加授权</a></li>
<li><a href="/perm/show_sudo/">查看sudo</a></li>
<li><a href="/perm/add_sudo/">添加sudo</a></li>
<li><a href="/perm/showlist/">查看授权</a></li>
<li><a href="/perm/add/">添加授权</a></li>
<li><a href="/sudo/showlist/">查看sudo</a></li>
<li><a href="/sudo/add/">添加sudo</a></li>
</ul>
</li>
<li>
<a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">日志审计</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/log/show_log/">查看日志</a></li>
<li><a href="/log/show_stat/">日志分析</a></li>
<li><a href="/log/showlist/">查看日志</a></li>
<li><a href="/log/detail/">日志分析</a></li>
</ul>
</li>
<li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment