sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

netcmd: Refactor duplicated SMB connect in GPO commands

Browse Source 
Do the SMB connection in a single helper function.

Note: this highlights that perhaps we want all SMB connections to be
signed, but we can fix that up separately.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Tim Beale 2018-12-14 10:47:45 +13:00 committed by Tim Beale
parent 5a6fcdd8fe
commit 888c6080c5
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
python/samba/netcmd/gpo.py
View File

@ -360,6 +360,14 @@ def create_directory_hier(conn, remotedir):
if not conn.chkpath(path):
conn.mkdir(path)
def smb_connection(dc_hostname, service, lp, creds, sign=False):
# SMB connect to DC
try:
conn = smb.SMB(dc_hostname, service, lp=lp, creds=creds, sign=sign)
except Exception:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
return conn
class GPOCommand(Command):
def construct_tmpdir(self, tmpdir, gpo):
@ -964,14 +972,8 @@ class cmd_fetch(GPOCommand):
raise CommandError("Invalid GPO path (%s)" % unc)
# SMB connect to DC
try:
conn = smb.SMB(dc_hostname,
service,
lp=self.lp,
creds=self.creds,
sign=True)
except Exception:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
conn = smb_connection(dc_hostname, service, lp=self.lp,
creds=self.creds, sign=True)
# Copy GPT
tmpdir, gpodir = self.construct_tmpdir(tmpdir, gpo)
@ -1033,10 +1035,8 @@ class cmd_backup(GPOCommand):
raise CommandError("Invalid GPO path (%s)" % unc)
# SMB connect to DC
try:
conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
except Exception:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
conn = smb_connection(dc_hostname, service, lp=self.lp,
creds=self.creds)
# Copy GPT
tmpdir, gpodir = self.construct_tmpdir(tmpdir, gpo)
@ -1192,10 +1192,8 @@ class cmd_create(GPOCommand):
# Connect to DC over SMB
[dom_name, service, sharepath] = parse_unc(unc_path)
self.sharepath = sharepath
try:
conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
except Exception as e:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname, e)
conn = smb_connection(dc_hostname, service, lp=self.lp,
creds=self.creds)
self.conn = conn
@ -1449,10 +1447,8 @@ class cmd_del(GPOCommand):
# Connect to DC over SMB
[dom_name, service, sharepath] = parse_unc(unc_path)
try:
conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
except Exception as e:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname, e)
conn = smb_connection(dc_hostname, service, lp=self.lp,
creds=self.creds)
self.samdb.transaction_start()
try:
@ -1527,10 +1523,8 @@ class cmd_aclcheck(GPOCommand):
raise CommandError("Invalid GPO path (%s)" % unc)
# SMB connect to DC
try:
conn = smb.SMB(dc_hostname, service, lp=self.lp, creds=self.creds)
except Exception:
raise CommandError("Error connecting to '%s' using SMB" % dc_hostname)
conn = smb_connection(dc_hostname, service, lp=self.lp,
creds=self.creds)
fs_sd = conn.get_acl(sharepath, security.SECINFO_OWNER | security.SECINFO_GROUP | security.SECINFO_DACL, security.SEC_FLAG_MAXIMUM_ALLOWED)