调整User,UserGroup类

connect.py

@@ -26,20 +26,19 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
 if django.get_version() != '1.6':
     django.setup()
 from jlog.models import Log
-from jumpserver.api import CONF, BASE_DIR, ServerError, Juser, Jasset, JassetGroup
+from jumpserver.api import CONF, BASE_DIR, ServerError, User, UserGroup, Asset, BisGroup
 from jumpserver.api import CRYPTOR, logger, is_dir
 
 try:
     import termios
     import tty
 except ImportError:
-    print '\033[1;31mOnly unix like supported.\033[0m'
+    print '\033[1;31m仅支持类Unix系统 Only unix like supported.\033[0m'
     time.sleep(3)
     sys.exit()
 
-CONF.read(os.path.join(BASE_DIR, 'jumpserver.conf'))
 log_dir = os.path.join(BASE_DIR, 'logs')
-login_user = Juser(username=getpass.getuser())
+login_user = User(username=getpass.getuser())
 
 
 def color_print(msg, color='red', exits=False):
@@ -265,7 +264,7 @@ def verify_connect(user, option):
     elif len(ip_matched) < 1:
         color_print('No Permission or No host.', 'red')
     else:
-        asset = Jasset(ip=ip_matched[0]).asset
+        asset = Asset(ip=ip_matched[0]).asset
         jtty = Jtty(user, asset)
         jtty.connect()
 

docs/AddUserAsset.py

@@ -127,14 +127,14 @@ def test_add_log():
 
 
 if __name__ == '__main__':
-    #install()
-    #test_add_dept()
-    #test_add_group()
-    #test_add_user()
-    #test_add_idc()
-    #test_add_asset_group()
+    install()
+    test_add_dept()
+    test_add_group()
+    test_add_user()
+    test_add_idc()
+    test_add_asset_group()
     test_add_asset()
-    #test_add_log()
+    test_add_log()
 
 
 

jasset/models.py

@@ -23,6 +23,45 @@ class BisGroup(models.Model):
     def __unicode__(self):
         return self.name
 
+    def get_asset(self):
+        return self.asset_set.all()
+
+    def get_asset_info(self, printable=False):
+        assets = self.get_asset()
+        for asset in assets:
+            if asset.comment:
+                print '%-15s -- %s' % (asset.ip, asset.comment)
+            else:
+                print '%-15s' % asset.ip
+        print ''
+
+    def get_asset_num(self):
+        return len(self.get_asset())
+
+    def get_user_group(self):
+        perm_list = self.perm_set.all()
+        user_group_list = []
+        for perm in perm_list:
+            user_group_list.append(perm.user_group)
+        return user_group_list
+
+    def get_user(self):
+        user_list = []
+        user_group_list = self.get_user_group()
+        for user_group in user_group_list:
+            user_list.extend(user_group.user_set.all())
+        return user_list
+
+    def is_permed(self, user=None, user_group=None):
+        if user:
+            if user in self.get_user():
+                return True
+
+        if user_group:
+            if user_group in self.get_user_group():
+                return True
+        return False
+
 
 class Asset(models.Model):
     LOGIN_TYPE_CHOICES = (
@@ -44,6 +83,22 @@ class Asset(models.Model):
     def __unicode__(self):
         return self.ip
 
+    def get_user(self):
+        perm_list = []
+        asset_group_all = self.bis_group.all()
+        for asset_group in asset_group_all:
+            perm_list.extend(asset_group.perm_set.all())
+
+        user_group_list = []
+        for perm in perm_list:
+            user_group_list.append(perm.user_group)
+
+        user_permed_list = []
+        for user_group in user_group_list:
+            user_permed_list.extend(user_group.user_set.all())
+        user_permed_list = list(set(user_permed_list))
+        return user_permed_list
+
 
 class AssetAlias(models.Model):
     user = models.ForeignKey(User)

juser/models.py

+#coding: utf-8
+
 from django.db import models
 
 
@@ -32,10 +34,90 @@ class User(models.Model):
     dept = models.ForeignKey(DEPT)
     group = models.ManyToManyField(UserGroup)
     ldap_pwd = models.CharField(max_length=128)
-    ssh_key_pwd = models.CharField(max_length=100)
+    ssh_key_pwd = models.CharField(max_length=200)
     is_active = models.BooleanField(default=True)
     last_login = models.DateTimeField(null=True)
     date_joined = models.DateTimeField(null=True)
 
     def __unicode__(self):
         return self.username
+
+    def get_asset_group(self):
+        """
+        Get user host_groups.
+        获取用户有权限的主机组
+        """
+        host_group_list = []
+        perm_list = []
+        user_group_all = self.group.all()
+        for user_group in user_group_all:
+            perm_list.extend(user_group.perm_set.all())
+
+        for perm in perm_list:
+            host_group_list.append(perm.asset_group)
+
+        return host_group_list
+
+    def get_asset_group_info(self, printable=False):
+        """
+        Get or print asset group info
+        获取或打印用户授权资产组
+        """
+        asset_groups_info = {}
+        asset_groups = self.get_asset_group()
+
+        for asset_group in asset_groups:
+            asset_groups_info[asset_group.id] = [asset_group.name, asset_group.comment]
+
+        if printable:
+            for group_id in asset_groups_info:
+                if asset_groups_info[group_id][1]:
+                    print "[%3s] %s -- %s" % (group_id,
+                                              asset_groups_info[group_id][0],
+                                              asset_groups_info[group_id][1])
+                else:
+                    print "[%3s] %s" % (group_id, asset_groups_info[group_id][0])
+                print ''
+        else:
+            return asset_groups_info
+
+    def get_asset(self):
+        """
+        Get the assets of under the user control.
+        获取主机列表
+        """
+        assets = []
+        asset_groups = self.get_asset_group()
+
+        for asset_group in asset_groups:
+            assets.extend(asset_group.asset_set.all())
+
+        return assets
+
+    def get_asset_info(self, printable=False):
+        """
+        Get or print the user asset info
+        获取或打印用户资产信息
+        """
+        from jasset.models import AssetAlias
+        assets_info = {}
+        assets = self.get_asset()
+
+        for asset in assets:
+            asset_alias = AssetAlias.objects.filter(user=self.user, asset=asset)
+            if asset_alias and asset_alias[0].alias != '':
+                assets_info[asset.ip] = [asset.id, asset.ip, str(asset_alias[0].alias)]
+            else:
+                assets_info[asset.ip] = [asset.id, asset.ip, str(asset.comment)]
+
+        if printable:
+            ips = assets_info.keys()
+            ips.sort()
+            for ip in ips:
+                if assets_info[ip][2]:
+                    print '%-15s -- %s' % (ip, assets_info[ip][2])
+                else:
+                    print '%-15s' % ip
+            print ''
+        else:
+            return assets_info

juser/views.py

@@ -13,6 +13,10 @@ from django.db.models import ObjectDoesNotExist
 from jumpserver.api import *
 
 
+def md5_crypt(string):
+    return hashlib.new("md5", string).hexdigest()
+
+
 def gen_rand_pwd(num):
     """
     generate random password