Skip to content

Feature/oic auth #997

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/oic auth #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebe076b
Add OpenID Security realm
zipkid Nov 23, 2020
d79c621
test fixed params
zipkid Nov 23, 2020
e6d4408
Fix Rubocop warnings
zipkid Nov 27, 2020
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
56 changes: 53 additions & 3 deletions files/puppet_helper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,17 @@ class Util {
}
} else {
// XXX explicit type declaration is required here
// def Class[] signature = args.collect {
// it instanceof Boolean ? boolean.class : it.class
// }
def Class[] signature = args.collect {
it instanceof Boolean ? boolean.class : it.class
if ( ( it instanceof String ) && ( it.startsWith('Boolean:') ) ) {
Boolean.class
} else if ( it instanceof Boolean ) {
boolean.class
} else {
it.class
}
}

ctor = c.getDeclaredConstructor(signature)
Expand All @@ -159,6 +168,15 @@ class Util {
break
}

args = args.collect {
if ( ( it instanceof String ) && ( it.startsWith('Boolean:') ) ) {
Boolean boolean_object = new Boolean(it.replace('Boolean:',''));
boolean_object
} else {
it
}
}

ctor.newInstance(*args)
}

Expand Down Expand Up @@ -823,15 +841,47 @@ class Actions {
]
break

// Open ID
case 'org.jenkinsci.plugins.oic.OicSecurityRealm':
config = [
setSecurityRealm: [
(className): [
realm.getClientId(),
realm.getClientSecret().plainText,
realm.getWellKnownOpenIDConfigurationUrl(),
realm.getTokenServerUrl(),
realm.getAuthorizationServerUrl(),
realm.getUserInfoServerUrl(),
realm.getUserNameField(),
realm.getTokenFieldToCheckKey(),
realm.getTokenFieldToCheckValue(),
realm.getFullNameFieldName(),
realm.getEmailFieldName(),
realm.getScopes(),
realm.getGroupsFieldName(),
realm.isDisableSslVerification(),
realm.isLogoutFromOpenidProvider(),
realm.getEndSessionEndpoint(),
realm.getPostLogoutRedirectUrl(),
realm.isEscapeHatchEnabled(),
realm.getEscapeHatchUsername(),
realm.getEscapeHatchSecret().plainText,
realm.getEscapeHatchGroup(),
realm.getAutomanualconfigure()
],
],
]
break

// constructor with no arguments
// "Delegate to servlet container"
case 'hudson.security.LegacySecurityRealm':
default:
config = [
setSecurityRealm: [
(realm.getClass().getName()): [],
],
]
],
]
}

def builder = new groovy.json.JsonBuilder(config)
Expand Down
24 changes: 24 additions & 0 deletions lib/puppet/type/jenkins_security_realm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,30 @@

newproperty(:arguments, array_matching: :all) do
desc 'List of arguments to security realm class constructor'

def insync?(is)
is_insync = true
reason = ''

is.each.with_index do |val, index|
item_is_not_insync = false
if val == :undef
item_is_not_insync = true if should[index].class != NilClass
reason = 'undef/nil'
elsif should[index].class == String && should[index].start_with?('Boolean:')
item_is_not_insync = true if should[index].gsub(%r{Boolean:}, '') != val.to_s
reason = 'Boolean'
elsif val != should[index]
item_is_not_insync = true
reason = 'N-EQ'
end

debug("Type jenkins_security_realm. Arguments NOT insync? Index: #{index} - is: '#{val}' - should: '#{should[index]}' - reason: #{reason}") if item_is_not_insync
is_insync = false if item_is_not_insync
end

is_insync
end
end

# require all instances of jenkins_user, as does
Expand Down