Changeset 3517 for lliurex-detect/trunk/fuentes/lliurex-detect.install/usr

Timestamp:

Feb 2, 2017, 5:19:12 PM (4 years ago)

Author:

mabarracus

Message:

Improved lliurex-detect with compatibility with lliurex-version

File:

• lliurex-detect/trunk/fuentes/lliurex-detect.install/usr/bin/lliurex-detect (modified) (1 diff)

lliurex-detect/trunk/fuentes/lliurex-detect.install/usr/bin/lliurex-detect

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+#
+# TODO: Detect live systems
+#
+#
+
 import sys
 import os 
+import pwd,grp
+import argparse
+import glob
 from subprocess import check_output
+
 ltsConfFile="/etc/lts.conf"
-result=[]
 
-def show_help():
-        print ("Usage: lliurex-detect [-t] [-f]\n\t -t show type\n\t -f show flavour\n")
-        exit(1)
-#def show_help
+def detect_live():
+    if (os.isdir('/rofs') and os.isdir('/cow')):
+        try:
+            check_output(['grep','loop','/proc/mounts'])
+            return None
+        except:
+            raise Exception('Not live')
+    raise Exception('Not live')
+#def detect_live():
 
 def detect_flavour():
-        try:
-                flavour=check_output(["lliurex-version","-v"]).split(",")[-1]
-        except Exception as e:
-                print ("Can't check flavour: lliurex-version not installed")
-                exit(1)
-        return flavour.strip()
+        file_name= [ filename for filename in glob.iglob('/usr/share/lliurex-cdd/**/cddflavour') ]
+        try:
+            with open(file_name[0],'r') as fileccd:
+                cdd= [ line.strip() for line in fileccd ]
+                cdd.sort()
+                return cdd
+        except Exception as e:
+            raise Exception('Error getting cddflavour: '+str(e))
 #def detect_flavour
 
+def detect_num_cdd():
+    try:
+        num_cdd=check_output(['dpkg-query','--showformat=\'${Version}\'','--show','lliurex-version-timestamp']).decode('utf-8')
+        return num_cdd.strip('\'')
+    except Exception as e:
+        raise Exception('Error '+e)
+#def detect_num_cdd():
+
+def get_history_version():
+    try:
+        with open('/etc/lliurex-cdd-version','r') as etc_cdd_file:
+            return etc_cdd_file.read()
+    except Exception as e:
+        raise Exception('Error: '+e)
+#def get_history_version()
+
 def detect_type():
-        display=os.environ.get('DISPLAY')
-        #On thin clients display is ip+display so it's at least 7 chars 
-        if len(display)>= 7:
-                client_type='thin'
-        else:
-                if os.path.exists(ltsConfFile):
-                #Attempt to open lts.conf as is more reliable than check environment
-                        try:
-                                for line in open (ltsConfFile):
-                                        if line=="LTSP_FATCLIENT":
-                                                if "true" in line:
-                                                        client_type="semi"
-                                                else:
-                                                        if "true" in line:
-                                                                client_type="thin"
-                                                        else:
-                                                                client_type="unknown"
-                                                break
-                                ltsConfFile.close()
-                        except:
-                                fatclient=os.environ.get('LTSP_FATCLIENT')
-                                if fatclient=='true':
-                                        client_type="semi"
-                                else:
-                                        if fatclient=='false':
-                                                client_type="thin"
-                                        else:
-                                                client_type="unknown"
-                else:
-                        client_type='fat'
-        return client_type.rstrip()
+#
+#   Possible output values: thin,semi,fat,unknown
+#
+#
+    display=os.environ.get('DISPLAY')
+    #On thin clients display is ip+display so it's at least 7 chars 
+    if len(display)>= 7:
+        client_type='thin'
+    else:
+        if os.path.exists(ltsConfFile):
+        #Attempt to open lts.conf as is more reliable than check environment
+            try:
+                for line in open (ltsConfFile):
+                    if line=="LTSP_FATCLIENT":
+                        if "true" in line:
+                            client_type="semi"
+                        else:
+                            if "true" in line:
+                                client_type="thin"
+                            else:
+                                client_type="unknown"
+                        break
+                ltsConfFile.close()
+            except:
+                fatclient=os.environ.get('LTSP_FATCLIENT')
+                if fatclient=='true':
+                    client_type="semi"
+                else:
+                    if fatclient=='false':
+                        client_type="thin"
+                    else:
+                        client_type="unknown"  
+        else:
+            client_type='fat'
+    return client_type.rstrip()
 #def detect_type
 
-def process_parms():
-        for parm in sys.argv:
-                error=1
-                if (parm=="-t"):
-                        result.append(detect_type())
-                        error=0
-                if (parm=="-f"):
-                        result.append(detect_flavour())
-                        error=0
-        if (error==1):
-                show_help()
-        return result
-#def process_parms
+def detect_user(user=''):
+    if user == '' or user == None:
+        user_id=os.getuid()
+        user_name=pwd.getpwuid(user_id)[0]
+    else:
+        try:
+            user_uid=pwd.getpwnam(user)[3]
+        except:
+            raise Exception('user not found!')
+        user_name=user
+    #user_info [0]=>username [1]=>pwd [2]=>uid [3]=>gid [4]=>gecos [5]=>homedir [6]=>shell
+    #grp_info [0]=>name [1]=>pwd [2]=>gid [3]=>member
+    grupos = [ group[0] for group in grp.getgrall() if user_name in group[3] ]
+    with open('/etc/passwd','r') as filepwd:
+        localusers=[ line.split(':')[0] for line in filepwd.readlines() ]
 
-if (len(sys.argv) > 1):
-        process_parms()
-else:
-        result.append(detect_type())
-        result.append(detect_flavour())
+    ret=user_name
+    if 'admins' in grupos :
+        ret='*'+str(user_name)
+    if user_name in localusers:
+        ret += '(local)'
+    else:
+        ret += '(ldap)'
+    return ret
+#def detect_user():
 
+parser = argparse.ArgumentParser(description='Get information about running environment')
+parser.add_argument('-a','--all',metavar='',action='store_const',help='Get all information',const=True)
+parser.add_argument('-s','--session',metavar='',action='store_const',help='Get current session type',const=True)
+parser.add_argument('-f','--flavour',metavar='',action='store_const',help='Get the flavour of current system',const=True)
+parser.add_argument('-u','--usertype',metavar='username',nargs='?',const='',help='Get the usertype from current user or from passed username')
+parser.add_argument('-lt','--ltsp',metavar='',action='store_const',help='Get if it\'s running on ltsp system',const=True)
+parser.add_argument('-lv','--live',metavar='',action='store_const',help='Get if it\'s running on live system',const=True)
+# lliurex-version options
+parser.add_argument('-n','--number',metavar='',action='store_const',const=True,help='Get the cdd number version')
+parser.add_argument('-v','--version',metavar='',action='store_const',const=True,help='Get the cdd version')
+parser.add_argument('-t','--test',metavar='cdd_name',help='Test if the cdd is installed')
+parser.add_argument('--history',metavar='',action='store_const',const=True,help='Get the installed meta\'s history')
+args=parser.parse_args()
 
-print (','.join(result))
+args_all=args.all
+#Commented due to compatibility with lliurex-version without parameters
+#args_all=True
+#if args.all != True:
+#    for arg in vars(args):
+#        if getattr(args,arg) != None:
+#            args_all=False
+#            break
+arg_none_for_lliurex_version=True
+if args.all != True:
+    for arg in vars(args):
+        if getattr(args,arg) != None:
+            arg_none_for_lliurex_version=False
+            break
+
+result=[]
+try:
+    if args_all or args.session != None:
+        result.append(detect_type())
+    if args_all or args.flavour != None:
+        result.append(detect_flavour()[-1])
+    if args_all or args.usertype != None:
+        result.append(detect_user(args.usertype))
+    if args.ltsp != None:
+        if 'fat' == detect_type():
+            exit(0)
+        else:
+            exit(1)
+        result.append()
+    if args.live != None:
+        try:
+            detect_live()
+            print('yes')
+            exit(0)
+        except:
+            print('no')
+            exit(1)
+#lliurex version options
+    if args_all or args.number != None:
+        print(detect_num_cdd())
+    if args_all or args.version != None:
+        print(', '.join(detect_flavour()))
+    if arg_none_for_lliurex_version:
+        ret=detect_flavour()
+        ret.append(detect_num_cdd())
+        print(', '.join(ret))
+    if args.test != None:
+        try:
+            detect_flavour()
+            exit(0)
+        except:
+            exit(1)
+    if args_all or args.history != None:
+        print(get_history_version().rstrip())
+#end lliurex-version options
+
+    if len(result) > 0:
+        print (','.join(result))
+
+except Exception as e:
+    print('Error '+e)
+    exit(1)
 
 exit (0)