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.

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

Handle explicit lists properly #51613

Merged
merged 4 commits into from Feb 14, 2019

Conversation

@twangboy
Copy link
Contributor

commented Feb 12, 2019

What does this PR do?

Handles explicit lists properly.

  • Properly decodes the key names when getting existing policies with explicit lists
  • Does not make value names the same as the values on explicit lists
  • Converts the ordered dicts lists to regular lists for PY3

Handles both of these states properly:
unc_paths.sls

Hardened UNC Paths:
  lgpo.set:
    - computer_policy:
        'Network\Network Provider\Hardened UNC Paths':
          'Hardened UNC Paths':
            '\\*\NETLOGON':
              RequireMutualAuthentication=1, RequireIntegrity=1
            '\\*\SYSVOL':
              RequireMutualAuthentication=1, RequireIntegrity=1

remote_assistance.sls

remote_assistance:
  lgpo.set:
    - computer_policy:
        'System\Remote Assistance\Configure Offer Remote Assistance':
          'Permit remote control of this computer':
            'Allow helpers to remotely control the computer'
          'Helpers':
            - Users
            - Administrators
            - Backup Operators

What issues does this PR fix or reference?

#51566

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy added the 2018.3.4 label Feb 12, 2019
@twangboy twangboy requested review from lomeroe and saltstack/team-windows Feb 12, 2019
Copy link
Contributor

left a comment

code looks good, can we add an explicit list type to the lgpo module integration test?

@dwoz
dwoz approved these changes Feb 12, 2019
@twangboy twangboy changed the base branch from 2018.3.4 to 2018.3 Feb 13, 2019
@twangboy twangboy added 2018.3.5 and removed 2018.3.4 labels Feb 13, 2019
@dwoz

This comment has been minimized.

Copy link
Contributor

commented Feb 13, 2019

@lomeroe I spoke with @twangboy and he said he'll add a test for this. We're just waiting on that and then we'll merge.

twangboy added 2 commits Feb 13, 2019
@dwoz dwoz merged commit 7ed5189 into saltstack:2018.3 Feb 14, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@twangboy twangboy deleted the twangboy:fix_51566 branch Feb 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.