cryptonas/cryptonas-branches
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added mounting and unmounting of config partition

Browse source 
moved config partition handling to CryptoBoxSettings
implemented environment checks (writeable config, https (off for now))
chown mounted directory after mount to the cryptobox user
This commit is contained in:
lars 2006-11-03 14:27:19 +00:00
commit 0fe6d426ed
5 changed files with 180 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

49
pythonrewrite/bin/CryptoBoxContainer.py
View file

@ -45,7 +45,6 @@ class CryptoBoxContainer:
self.device = device
self.cbox = cbox
self.log = logging.getLogger("CryptoBox")
self.Progs = self.cbox.prefs["Programs"]
self.resetObject()
@ -157,8 +156,8 @@ class CryptoBoxContainer:
stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"cryptsetup",
"luksAddKey",
self.device,
@ -182,7 +181,7 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["cryptsetup"],
self.cbox.prefs["Programs"]["cryptsetup"],
"--batch-mode",
"luksDelKey",
self.device,
@ -228,7 +227,7 @@ class CryptoBoxContainer:
stdin=None,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
args=[self.Progs["blkid"],
args=[self.cbox.prefs["Programs"]["blkid"],
"-s", "UUID",
"-o", "value",
"-c", os.devnull,
@ -267,7 +266,7 @@ class CryptoBoxContainer:
stdin=None,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
args=[self.Progs["blkid"],
args=[self.cbox.prefs["Programs"]["blkid"],
"-s", "TYPE",
"-o", "value",
"-c", os.devnull,
@ -295,7 +294,7 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = devnull,
args = [
self.Progs["cryptsetup"],
self.cbox.prefs["Programs"]["cryptsetup"],
"--batch-mode",
"isLuks",
self.device])
@ -332,8 +331,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"cryptsetup",
"luksOpen",
self.device,
@ -351,8 +350,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"mount",
os.path.join(self.__dmDir, self.name),
self.__getMountPoint()])
@ -378,8 +377,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"umount",
self.__getMountPoint()])
proc.wait()
@ -394,8 +393,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"cryptsetup",
"luksClose",
self.name,
@ -429,8 +428,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"mount",
self.device,
self.__getMountPoint()])
@ -456,8 +455,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"umount",
self.__getMountPoint()])
proc.wait()
@ -483,7 +482,7 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["mkfs-data"],
self.cbox.prefs["Programs"]["mkfs-data"],
self.device])
proc.wait()
if proc.returncode != 0:
@ -513,8 +512,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"cryptsetup",
"luksFormat",
self.device,
@ -534,8 +533,8 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["super"],
self.Progs["CryptoBoxRootActions"],
self.cbox.prefs["Programs"]["super"],
self.cbox.prefs["Programs"]["CryptoBoxRootActions"],
"cryptsetup",
"luksOpen",
self.device,
@ -554,7 +553,7 @@ class CryptoBoxContainer:
stdout = devnull,
stderr = subprocess.PIPE,
args = [
self.Progs["mkfs-data"],
self.cbox.prefs["Programs"]["mkfs-data"],
os.path.join(self.__dmDir, self.name)])
proc.wait()
"remove the mapping - for every exit status"