fcad: Migrated to libsmb

Author: olivergs

admin/fleetcommander/fcad.py

@@ -25,6 +25,7 @@
 import uuid
 import getpass
 import tempfile
+import optparse
 
 from functools import wraps
 
@@ -35,11 +36,19 @@
 import ldap.modlist
 
 import samba
-from samba import param, smb
+import samba.getopt as options
 from samba.credentials import Credentials, MUST_USE_KERBEROS
 from samba.ndr import ndr_unpack, ndr_pack
 from samba.dcerpc import security
 from samba.ntacls import dsacl2fsacl
+from samba.samba3 import param as s3param
+
+try:
+    from samba.samba3 import libsmb
+    logging.debug('Using SAMBA 3 SMB connection')
+except ImportError:
+    from samba.samba3 import libsmb_samba_internal as libsmb
+    logging.debug('Using SAMBA 3 SMB connection (Internal)')
 
 
 GPO_SMB_PATH = '\\\\%s\\SysVol\\%s\\Policies\\%s'
@@ -144,13 +153,32 @@ def _get_server_name(self):
     def _generate_gpo_uuid(self):
         return '{%s}' % str(uuid.uuid4()).upper()
 
+    # def _get_smb_connection(self, service='SysVol'):
+    #     # Connect to SMB using kerberos
+    #     parm = param.LoadParm()
+    #     creds = Credentials()
+    #     creds.set_kerberos_state(MUST_USE_KERBEROS)
+    #     creds.guess(parm)
+    #     conn = SMBConn(self._get_server_name(), service, lp=parm, creds=creds)
+    #     return conn
+
     def _get_smb_connection(self, service='SysVol'):
-        # Connect to SMB using kerberos
-        parm = param.LoadParm()
+        # Create options like if we were using command line
+        parser = optparse.OptionParser()
+        sambaopts = options.SambaOptions(parser)
+        # Samba options
+        parm = sambaopts.get_loadparm()
+        s3_lp = s3param.get_context()
+        s3_lp.load(parm.configfile)
+        # Build credentials from credential options
         creds = Credentials()
+        # Credentials need username and realm to be not empty strings to work
+        creds.set_username('NOTEMPTY')
+        creds.set_realm('NOTEMPTY')
+        # Connect to SMB using kerberos
         creds.set_kerberos_state(MUST_USE_KERBEROS)
-        creds.guess(parm)
-        conn = smb.SMB(self._get_server_name(), service, lp=parm, creds=creds)
+        # Create connection
+        conn = libsmb.Conn(self._get_server_name(), service, lp=parm, creds=creds, sign=False)
         return conn
 
     def _load_smb_data(self, gpo_uuid):

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(fleet-commander-admin, 0.15.0, aruiz@redhat.com)
+AC_INIT(fleet-commander-admin, 0.15.1, aruiz@redhat.com)
 AC_COPYRIGHT([Copyright 2014,2015,2016,2017,2018 Red Hat, Inc.])
 
 AC_PREREQ(2.64)