public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-03-31 02:50:17 +03:00
Code Issues Projects Releases Wiki Activity

cleanup after errors in create_gpo()

Browse Source
This commit is contained in:
Dmitry Degtyarev 2021-08-19 11:51:54 +04:00
parent 4f4235f01b
commit 3d7a2105fc
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/adldap/ad_interface.cpp
View File

@ -1243,6 +1243,28 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
// Ex: "\\domain.alt\sysvol\domain.alt\Policies\{FF7E0880-F3AD-4540-8F1D-4472CB4A7044}"
const QString gPCFileSysPath = QString("\\\\%1\\sysvol\\%2\\Policies\\%3").arg(d->domain.toLower(), d->domain.toLower(), uuid);
const QString main_dir = sysvol_path_to_smb(gPCFileSysPath);
const QString dn = QString("CN=%1,CN=Policies,CN=System,%2").arg(uuid, d->domain_head);
// After each error case we need to clean up whatever we
// have created successfully so far. Don't just use
// delete_gpo() because we want to delete partially in
// some error cases and that shouldn't print any error
// messages.
auto cleanup = [&]() {
const AdObject gpc_object = search_object(dn);
const bool gpc_exists = !gpc_object.is_empty();
if (gpc_exists) {
object_delete(dn);
}
struct stat filestat;
const int stat_result = smbc_stat(cstr(main_dir), &filestat);
const bool gpt_exists = (stat_result == 0);
if (gpt_exists) {
d->delete_gpt(main_dir);
}
};
//
// Create dirs and files for policy on sysvol
@ -1250,11 +1272,12 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
// Create main dir
// "smb://domain.alt/sysvol/domain.alt/Policies/{FF7E0880-F3AD-4540-8F1D-4472CB4A7044}"
const QString main_dir = sysvol_path_to_smb(gPCFileSysPath);
const int result_mkdir_main = smbc_mkdir(cstr(main_dir), 0755);
if (result_mkdir_main != 0) {
error_message(tr("Failed to create policy main dir"));
cleanup();
return false;
}
@ -1263,6 +1286,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (result_mkdir_machine != 0) {
error_message(tr("Failed to create policy machine dir"));
cleanup();
return false;
}
@ -1271,6 +1296,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (result_mkdir_user != 0) {
error_message(tr("Failed to create policy user dir"));
cleanup();
return false;
}
@ -1279,6 +1306,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (ini_file < 0) {
error_message(tr("Failed to open policy ini"));
cleanup();
return false;
}
@ -1288,18 +1317,21 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (bytes_written < 0) {
error_message(tr("Failed to write policy ini"));
cleanup();
return false;
}
//
// Create AD object for gpo
//
const QString dn = QString("CN=%1,CN=Policies,CN=System,%2").arg(uuid, d->domain_head);
dn_out = dn;
const bool result_add = object_add(dn, CLASS_GP_CONTAINER);
if (!result_add) {
error_message(tr("Failed to create object for GPO"));
cleanup();
return false;
}
@ -1321,6 +1353,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (!replace_success) {
error_message(tr("Failed to set policy attribute"));
cleanup();
return false;
}
}
@ -1332,6 +1366,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (!result_add_user) {
error_message(tr("Failed to create user folder object for GPO"));
cleanup();
return false;
}
@ -1342,6 +1378,8 @@ bool AdInterface::create_gpo(const QString &display_name, QString &dn_out) {
if (!result_add_machine) {
error_message(tr("Failed to create machine folder object for GPO"));
cleanup();
return false;
}
@ -1557,7 +1595,7 @@ bool AdInterface::gpo_sync_perms(const QString &dn) {
return false;
}
// Get list of GPT contents
// NOTE: order is important, have to set perms of parent