wni: use win32net module for creating new user
This require UAC disabled (or already started as administrator), but works much more reliable ("net user" sometimes fails _silently_).
This commit is contained in:
parent
e5c2448af4
commit
63eccac025
@ -27,6 +27,7 @@ import os
|
|||||||
import os.path
|
import os.path
|
||||||
import win32api
|
import win32api
|
||||||
import win32net
|
import win32net
|
||||||
|
import win32netcon
|
||||||
import pywintypes
|
import pywintypes
|
||||||
import md5
|
import md5
|
||||||
|
|
||||||
@ -43,6 +44,8 @@ class QubesWniVmStorage(QubesVmStorage):
|
|||||||
# Use the user profile as "private.img"
|
# Use the user profile as "private.img"
|
||||||
self.private_img = os.path.join("c:\\Users", self._get_username())
|
self.private_img = os.path.join("c:\\Users", self._get_username())
|
||||||
|
|
||||||
|
self.home_root = 'c:\\Users'
|
||||||
|
|
||||||
# Pass paths for WNI libvirt driver
|
# Pass paths for WNI libvirt driver
|
||||||
os.putenv("WNI_DRIVER_QUBESDB_PATH", system_path['qubesdb_daemon_path'])
|
os.putenv("WNI_DRIVER_QUBESDB_PATH", system_path['qubesdb_daemon_path'])
|
||||||
os.putenv("WNI_DRIVER_QREXEC_PATH", system_path['qrexec_agent_path'])
|
os.putenv("WNI_DRIVER_QREXEC_PATH", system_path['qrexec_agent_path'])
|
||||||
@ -65,27 +68,49 @@ class QubesWniVmStorage(QubesVmStorage):
|
|||||||
return {}
|
return {}
|
||||||
|
|
||||||
def create_on_disk_private_img(self, verbose, source_template = None):
|
def create_on_disk_private_img(self, verbose, source_template = None):
|
||||||
win32api.ShellExecute(None, "runas",
|
home_dir = os.path.join(self.home_root, self._get_username())
|
||||||
"net", "user %s %s /ADD"
|
# Create user data in information level 1 (PyUSER_INFO_1) format.
|
||||||
% (self._get_username(), self._get_password()),
|
user_data = {}
|
||||||
None, 0)
|
user_data['name'] = self._get_username()
|
||||||
|
user_data['full_name'] = self._get_username()
|
||||||
|
user_data['password'] = self._get_password()
|
||||||
|
user_data['flags'] = (
|
||||||
|
win32netcon.UF_NORMAL_ACCOUNT |
|
||||||
|
win32netcon.UF_SCRIPT |
|
||||||
|
win32netcon.UF_DONT_EXPIRE_PASSWD
|
||||||
|
)
|
||||||
|
user_data['priv'] = win32netcon.USER_PRIV_USER
|
||||||
|
user_data['home_dir'] = home_dir
|
||||||
|
user_data['max_storage'] = win32netcon.USER_MAXSTORAGE_UNLIMITED
|
||||||
|
# TODO: catch possible exception
|
||||||
|
win32net.NetUserAdd(None, 1, user_data)
|
||||||
|
|
||||||
def create_on_disk_root_img(self, verbose, source_template = None):
|
def create_on_disk_root_img(self, verbose, source_template = None):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def remove_from_disk(self):
|
def remove_from_disk(self):
|
||||||
win32api.ShellExecute(None, "runas",
|
try:
|
||||||
"net", "user %s /DELETE" % (self._get_username()),
|
win32net.NetUserDel(None, self._get_username())
|
||||||
None, 0)
|
except pywintypes.error, details:
|
||||||
|
if details[0] == 2221:
|
||||||
|
# "The user name cannot be found."
|
||||||
|
raise IOError("User %s doesn't exist" % self._get_username())
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
super(QubesWniVmStorage, self).remove_from_disk()
|
super(QubesWniVmStorage, self).remove_from_disk()
|
||||||
|
|
||||||
def rename(self, old_name, new_name):
|
def rename(self, old_name, new_name):
|
||||||
super(QubesWniVmStorage, self).rename(old_name, new_name)
|
super(QubesWniVmStorage, self).rename(old_name, new_name)
|
||||||
win32api.ShellExecute(None, "runas",
|
user_data = {}
|
||||||
"wmic", "useraccount where name='%s' rename '%s'"
|
user_data['name'] = self._get_username(new_name)
|
||||||
% (self._get_username(old_name), self._get_username(new_name)),
|
win32net.NetUserSetInfo(None,
|
||||||
None, 0)
|
self._get_username(old_name), 0, user_data)
|
||||||
# TODO: update password
|
win32net.NetUserChangePassword(None,
|
||||||
|
self._get_username(new_name),
|
||||||
|
self._get_password(old_name),
|
||||||
|
self._get_password(new_name))
|
||||||
|
#TODO: rename user profile
|
||||||
|
|
||||||
|
|
||||||
def verify_files(self):
|
def verify_files(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user