diff --git a/chgpass.sh b/chgpass.sh deleted file mode 100755 index 624f512be..000000000 --- a/chgpass.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -username=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} - -dir=$(cwd) -. ${dir}/shell.conf - -id ${username} &> /dev/null -if [ $? != 0 ];then - echo "$username is not exist." - exit 3 -fi - -echo "$password" | passwd --stdin "$username" - -#ssh -p $host2_port $host2 "echo \"$password\" | passwd --stdin \"$username\"" \ No newline at end of file diff --git a/genkey.sh b/genkey.sh deleted file mode 100755 index 2d7cf1359..000000000 --- a/genkey.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -user=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} - -dir=$(cwd) -. ${dir}/shell.conf - -keyfile=${dir}/keys/${user} -rm -f ${keyfile} - -gen_key() { - ssh-keygen -t rsa -f ${keyfile} -P $1 -} - -if [ -z $1 ] || [ -z $2 ];then - echo "Usage: ./script user password" - exit 3 -fi - -gen_key ${password} - -mkdir -p /home/${user}/.ssh -#ssh -p ${host2_port} ${host2} "mkdir -p /home/$user/.ssh" - -cat ${keyfile}.pub > /home/${user}/.ssh/authorized_keys -#ssh -p ${host2_port} ${host2} "cat > /home/$user/.ssh/authorized_keys" < ${keyfile}.pub - -chmod 600 /home/${user}/.ssh/authorized_keys -#ssh -p ${host2_port} ${host2} "chmod 600 /home/$user/.ssh/authorized_keys" - -chown -R ${user}:${user} /home/${user}/.ssh -#ssh -p ${host2_port} ${host2} "chown -R $user:$user /home/$user/.ssh" \ No newline at end of file diff --git a/jumpserver.conf b/jumpserver.conf index 864efc99d..7a1aba394 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -13,12 +13,6 @@ user_table = UserManage_user assets_table = Assets_assets assets_user_table = Assets_assetsuser key = 88aaaf7ffe3c6c04 -useradd_shell = /opt/jumpserver/useradd.sh -userdel_shell = /opt/jumpserver/userdel.sh -sudoadd_shell = /opt/jumpserver/sudoadd.sh -sudodel_shell = /opt/jumpserver/sudodel.sh -keygen_shell = /opt/jumpserver/genkey.sh -chgpass_shell = /opt/jumpserver/chgpass.sh rsa_dir = /opt/jumpserver/keys ldap_host = ldap://127.0.0.1:389 ldap_base_dn = dc=yolu,dc=com diff --git a/shell.conf b/shell.conf deleted file mode 100644 index 34b2545d0..000000000 --- a/shell.conf +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -host=127.0.0.1 -ldapassword=VNLqNCjpNBIetEoCA2h3 -domain=yolu -suffix=com -#host2=172.16.2.74 -#host2_port=2001 \ No newline at end of file diff --git a/sudo.ldif b/sudo.ldif deleted file mode 100644 index c18f678aa..000000000 --- a/sudo.ldif +++ /dev/null @@ -1,9 +0,0 @@ -dn: cn=guanghongwei,ou=Sudoers,dc=dianping,dc=com -objectClass: top -objectClass: sudoRole -cn: guanghongwei -sudoCommand: /bin/pwd -sudoHost: ALL -sudoOption: !authenticate -sudoRunAsUser: ALL -sudoUser: guanghongwei diff --git a/sudoadd.sh b/sudoadd.sh deleted file mode 100755 index ce48f1956..000000000 --- a/sudoadd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -username=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} - -dir=$(cwd) -. ${dir}/shell.conf - - -sudo_file=${dir}/sudo.ldif -user_sudo_file=${dir}/${username}.ldif - -if [ -z $1 ];then - echo - echo "usage: ./sudoadd.sh username " - echo - exit 3 -fi - -id ${username} &> /dev/null -if [ $? != '0' ];then - echo "$username is not exit!" - exit 3 -fi - -sed -i "/guanghongwei/ s@dianping@$domain@g" ${sudo_file} -sed -i "/guanghongwei/ s@com@$suffix@g" ${sudo_file} -sed -e "s@guanghongwei@$username@g" ${sudo_file} > $user_sudo_file - - -ldapadd -x -h ${host} -w ${ldapassword} -D "cn=admin,dc=$domain,dc=$suffix" -f $user_sudo_file -rm -f $user_sudo_file \ No newline at end of file diff --git a/sudodel.sh b/sudodel.sh deleted file mode 100755 index e1cd090bf..000000000 --- a/sudodel.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -username=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} -dir=$(cwd) -. ${dir}/shell.conf - -id $username &> /dev/null -if [ $? == '0' ];then - userdel -r $username -else - echo "$username is not exist." -fi -ldapdelete -x -h $host -D "cn=admin,dc=$domain,dc=$suffix" -w $ldapassword "cn=$username,ou=Sudoers,dc=$domain,dc=$suffix" \ No newline at end of file diff --git a/useradd.sh b/useradd.sh deleted file mode 100755 index 481dc10b7..000000000 --- a/useradd.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -username=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} - -dir=$(cwd) -. ${dir}/shell.conf - -if [ -z $1 ] || [ -z $2 ];then - echo - echo "usage: ./useradd.sh username password" - echo - exit 3 -fi - -id $username &> /dev/null -if [ $? != '0' ];then - useradd $username - #ssh -p $host2_port $host2 "useradd $username" - echo $password | passwd --stdin $username -else - echo "$username have been exits." - exit 5 -fi - -cd /usr/share/migrationtools/ -./migrate_passwd.pl /etc/passwd > /tmp/passwd.ldif -./migrate_group.pl /etc/group > /tmp/group.ldif - -grep -A15 "dn: uid=$username,ou=People,dc=$domain,dc=$suffix" /tmp/passwd.ldif > /tmp/user.ldif -grep -A6 "dn: cn=$username,ou=Group,dc=$domain,dc=$suffix" /tmp/group.ldif > /tmp/usergroup.ldif - -ldapadd -x -h $host -w $ldapassword -D "cn=admin,dc=$domain,dc=$suffix" -f /tmp/user.ldif -ldapadd -x -h $host -w $ldapassword -D "cn=admin,dc=$domain,dc=$suffix" -f /tmp/usergroup.ldif \ No newline at end of file diff --git a/userdel.sh b/userdel.sh deleted file mode 100755 index 6db0b83c5..000000000 --- a/userdel.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -username=$1 -password=$2 - -cwd (){ - dir=$0 - dirname $dir -} - -dir=$(cwd) -. ${dir}/shell.conf - -id $username &> /dev/null -if [ $? == '0' ];then - userdel -r $username - #ssh -p $host2_port $host2 "userdel -r $username" -else - echo "$username is not exist." -fi -ldapdelete -x -h $host -D "cn=admin,dc=$domain,dc=$suffix" -w $ldapassword "uid=$username,ou=People,dc=$domain,dc=$suffix" -ldapdelete -x -h $host -D "cn=admin,dc=$domain,dc=$suffix" -w $ldapassword "cn=$username,ou=Group,dc=$domain,dc=$suffix" \ No newline at end of file diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index e2c1338b7..88ef23560 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/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)) \ No newline at end of file diff --git a/webroot/AutoSa/templates/base.html b/webroot/AutoSa/templates/base.html index b3212a466..853e4697f 100644 --- a/webroot/AutoSa/templates/base.html +++ b/webroot/AutoSa/templates/base.html @@ -47,11 +47,23 @@
-
密码管理
+
+ 密码管理 +
+ +
+ 文件传输 +
+ + +
@@ -109,6 +121,12 @@
  • 查看权限
  • 添加权限
    • +
    + 文件传输 +
    + diff --git a/webroot/AutoSa/templates/info.html b/webroot/AutoSa/templates/info.html index 34acc156c..ec1393336 100644 --- a/webroot/AutoSa/templates/info.html +++ b/webroot/AutoSa/templates/info.html @@ -42,7 +42,7 @@ {% endif %} {% if error %} -
    错误:{{ error }}
    +
    错误:{{ error }}
    {% endif %} diff --git a/webroot/AutoSa/templates/upFile.html b/webroot/AutoSa/templates/upFile.html new file mode 100644 index 000000000..0e18c7489 --- /dev/null +++ b/webroot/AutoSa/templates/upFile.html @@ -0,0 +1,43 @@ +{% extends 'base.html' %} +{% block content %} +
    +
    + {{ username }} -- 上传文件 + {% if error %} +
    + {{ error }} +
    + {% endif %} + {% if msg %} +
    + {{ msg }} +
    + {% endif %} + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +{% endblock %} \ No newline at end of file