Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set Machine Extension Names to the correct value #43

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Set Machine Extension Names to the correct value #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ad/internal/winrmhelper/winrm_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func RunWinRMCommand(conn *winrm.Client, cmds []string, json bool) (*WinRMResult
}
if err != nil {
log.Printf("[DEBUG] run error : %s", err)
return nil, fmt.Errorf("powershell command failed with exit code %d\nstdout: %s\nstderr: %s", res, stdout, stderr)
return nil, fmt.Errorf("powershell command failed with exit code %d\nstdout: %s\nstderr: %s\nerror: %s", res, stdout, stderr, err)
}

result := &WinRMResult{
Expand Down Expand Up @@ -63,8 +63,21 @@ func SanitiseTFInput(d *schema.ResourceData, key string) string {
"\v", "`v",
)

// placeholder for now.
out := cleanupReplacer.Replace(d.Get(key).(string))
log.Printf("[DEBUG] sanitising key %q to: %s", key, out)
return out
}

// SetMachineExtensionName will add the necessary GUIDs to the GPO's gPCMachineExtensionNames attribute.
// These are required for the security settings part of a GPO to work.
func SetMachineExtensionNames(client *winrm.Client, gpoDN, value string) error {
cmd := fmt.Sprintf(`Set-ADObject -Identity "%s" -Replace @{gPCMachineExtensionNames="%s"}`, gpoDN, value)
result, err := RunWinRMCommand(client, []string{cmd}, false)
if err != nil {
return fmt.Errorf("error while setting machine extension names for GPO %q: %s", gpoDN, err)
}
if result.ExitCode != 0 {
return fmt.Errorf("command to set machine extension names for GPO %q failed, stderr: %s, stdout: %s", gpoDN, result.StdErr, result.Stdout)
}
return nil
}
8 changes: 8 additions & 0 deletions ad/resource_ad_gpo_security.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,15 @@ func resourceADGPOSecurityCreate(d *schema.ResourceData, meta interface{}) error
return err
}

// GUIDs for security settings are defined here:
// https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-gpsb/55bb803e-b35f-4ce8-b558-4c1e92ad77a4
err = winrmhelper.SetMachineExtensionNames(winrmClient, gpo.DN, "[{827D319E-6EAC-11D2-A4EA-00C04F79F83A}{803E14A0-B4FB-11D0-A0D0-00A0C90F574B}]")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feels like maybe these should be constants to give some meaning to these?

if err != nil {
return err
}

d.SetId(fmt.Sprintf("%s_securitysettings", guid))

return resourceADGPOSecurityRead(d, meta)
}

Expand Down