删除没用的代码，添加上传文件

webroot/AutoSa/AutoSa/views.py

@@ -25,13 +25,6 @@ cf.read('%s/jumpserver.conf' % base_dir)
 
 key = cf.get('jumpserver', 'key')
 rsa_dir = cf.get('jumpserver', 'rsa_dir')
-useradd_shell = cf.get('jumpserver', 'useradd_shell')
-userdel_shell = cf.get('jumpserver', 'userdel_shell')
-sudoadd_shell = cf.get('jumpserver', 'sudoadd_shell')
-sudodel_shell = cf.get('jumpserver', 'sudodel_shell')
-keygen_shell = cf.get('jumpserver', 'keygen_shell')
-chgpass_shell = cf.get('jumpserver', 'chgpass_shell')
-admin = ['admin']
 ldap_host = cf.get('jumpserver', 'ldap_host')
 ldap_base_dn = cf.get('jumpserver', 'ldap_base_dn')
 admin_cn = cf.get('jumpserver', 'admin_cn')
@@ -684,10 +677,10 @@ def showAssets(request):
         assets = []
         username = request.session.get('username')
         user = User.objects.get(username=username)
-        for asset in user.assetsuser_set.all():
+        for asset in user.assetsuser_set.all().order_by('ip'):
             assets.append(asset.aid)
     else:
-        assets = Assets.objects.all()
+        assets = Assets.objects.all().order_by('ip')
     if request.method == 'POST':
         if request.session.get('admin') < 2:
             return HttpResponseRedirect('/showAssets/')
@@ -747,7 +740,7 @@ def showPerm(request):
         if request.GET.get('username'):
             username = request.GET.get('username')
             user = User.objects.get(username=username)
-            assets_user = AssetsUser.objects.filter(uid=user.id).order_by()
+            assets_user = AssetsUser.objects.filter(uid=user.id)
             return render_to_response('perms.html',
                                       {'user': user, 'assets': assets_user, 'perm_menu': 'active'},
                                       context_instance=RequestContext(request))
@@ -887,3 +880,21 @@ def chgKey(request):
 
         return render_to_response('info.html', {'msg': '修改密码成功'})
 
+
+@login_required
+def upFile(request):
+    username = request.session.get('username')
+    msg = ''
+    error = ''
+    upload_dir = '/tmp/upload/'
+    if request.method == 'POST':
+        host = request.POST.get('host')
+        path = request.POST.get('path')
+        upload_file = request.FILES.get('file', None)
+
+        return HttpResponse('%s: %s' % (upload_file.name, upload_file.size))
+
+
+    return render_to_response('upFile.html',
+                              {'username': username},
+                              context_instance=RequestContext(request))

webroot/AutoSa/templates/base.html

@@ -47,11 +47,23 @@
         <div class="row>
 		<!--Sidebar content-->
 		<div class="sidebar-menu">
-          <div class="menu-first" ><a href="#userMenu" data-toggle="collapse"><i class="glyphicon glyphicon-th"></i> 密码管理</a></div>
+          <div class="menu-first" ><a href="#userMenu" data-toggle="collapse">
+              <i class="glyphicon glyphicon-th"></i> 密码管理</a>
+          </div>
           <ul id="userMenu" class="nav nav-list navbar-collapse.in menu-second">
             <li><a href="/chgPass/"><i class="glyphicon glyphicon-send"></i> 登陆密码</a></li>
             <li><a href="/chgKey/"><i class="glyphicon glyphicon-send"></i> 密钥密码</a></li>
           </ul>
+
+          <div class="menu-first" ><a href="#fileMenu" data-toggle="collapse">
+              <i class="glyphicon glyphicon-th"></i> 文件传输</a>
+          </div>
+          <ul id="fileMenu" class="nav nav-list navbar-collapse.in menu-second">
+            <li><a href="/upFile/"><i class="glyphicon glyphicon-send"></i> 上传文件</a></li>
+            <li><a href="/downFile/"><i class="glyphicon glyphicon-send"></i> 下载文件</a></li>
+          </ul>
+
+
         </div>
       </div>
     </div>
@@ -109,6 +121,12 @@
             <li><a href="/showPerm/"><i class="glyphicon glyphicon-send"></i> 查看权限</a></li>
             <li><a href="/addPerm/"><i class="glyphicon glyphicon-send"></i> 添加权限</a></li>
           </ul>
+         <div class="menu-first" ><a href="#fileMenu" data-toggle="collapse">
+              <i class="glyphicon glyphicon-th"></i> 文件传输</a>
+          </div>
+          <ul id="fileMenu" class="nav nav-list navbar-collapse.in menu-second">
+            <li><a href="/upFile/"><i class="glyphicon glyphicon-send"></i> 上传文件</a></li>
+            <li><a href="/downFile/"><i class="glyphicon glyphicon-send"></i> 下载文件</a></li>
           </ul>
         </div>
       </div>

webroot/AutoSa/templates/info.html

@@ -42,7 +42,7 @@
 {% endif %}
 
 {% if error %}
-<div class="alert alert-danger"><b>错误:</b>{{ error }}</div>
+<div class="alert alert-danger" style="margin-left: auto;margin-right: auto;margin-top: 60px;width:500px;"><b>错误:</b>{{ error }}</div>
 {% endif %}
 </body>
 </html>

webroot/AutoSa/templates/upFile.html

@@ -0,0 +1,43 @@
+{% extends 'base.html' %}
+{% block content %}
+    <form class="form-horizontal" enctype="multipart/form-data" role="form" method="post" action="" >
+        <fieldset >
+            <legend>{{ username }} -- 上传文件</legend>
+            {% if error %}
+                <div class="alert alert-danger">
+                    {{ error }}
+                </div>
+            {% endif %}
+            {% if msg %}
+                <div class="alert alert-success">
+                    {{ msg }}
+                </div>
+            {% endif %}
+                    <input type="text"   name="username" value="{{ username }}" hidden="hidden">
+            <div class="form-group">
+                <label for="host" class="col-sm-2 control-label">服务器IP<span style="color: red"> *</span></label>
+                <div class="col-sm-4">
+                    <input type="text" class="form-control" id="host" name="host" placeholder="IP">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="path" class="col-sm-2 control-label">上传目录<span style="color: red"> *</span></label>
+                <div class="col-sm-4">
+                    <input type="text" class="form-control" id="path" name="path" placeholder="服务器目录">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="file" class="col-sm-2 control-label">上传目录<span style="color: red"> *</span></label>
+                <div class="col-sm-4">
+                    <input type="file" class="form-control" id="file" name="file" placeholder="点击添加">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-sm-offset-2 col-sm-4">
+                    <button class="btn btn-primary">上传</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+{% endblock %}