github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:trueos/sysadm

Browse Source
This commit is contained in:
Mrt134
2016-12-09 14:34:59 -05:00
parent 607623d2bf bf2a660854
commit 36e6a94031
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/library/sysadm-users.cpp
View File

@@ -92,10 +92,12 @@ bool UserManager::addUser(QJsonObject* out, QJsonObject obj){
QString dev = obj.value("personacrypt_init").toString();
if(dev.startsWith("/dev/")){ dev = dev.remove(0,5); }
//Verify that the given device is valid
QStringList valid = getAvailablePersonaCryptDevices();
for(int i=0; i<valid.length(); i++){
if(valid[i].startsWith(dev+": ")){ PCdev = dev; } //this is a valid device
}
if(dev!="PEFS"){
QStringList valid = getAvailablePersonaCryptDevices();
for(int i=0; i<valid.length(); i++){
if(valid[i].startsWith(dev+": ")){ PCdev = dev; } //this is a valid device
}
}else{ PCdev = dev; } //PEFS device
if(PCdev!=dev){ return false; } //invalid inputs - invalid device for PersonaCrypt
}
QTemporaryFile pwfile("/tmp/.XXXXXXXXXXXXXXX");
@@ -169,10 +171,12 @@ bool UserManager::modifyUser(QJsonObject* out, QJsonObject obj){
QString dev = obj.value("personacrypt_init").toString();
if(dev.startsWith("/dev/")){ dev = dev.remove(0,5); }
//Verify that the given device is valid
QStringList valid = getAvailablePersonaCryptDevices();
for(int i=0; i<valid.length(); i++){
if(valid[i].startsWith(dev+": ")){ PCdev = dev; } //this is a valid device
}
if(dev!="PEFS"){
QStringList valid = getAvailablePersonaCryptDevices();
for(int i=0; i<valid.length(); i++){
if(valid[i].startsWith(dev+": ")){ PCdev = dev; } //this is a valid device
}
}else{ PCdev = dev; } //PEFS device
if(PCdev!=dev){ return false; } //invalid inputs - invalid device for PersonaCrypt
}
//Now start assembling the external command