valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

solr module: add support for username and password

Browse Source
This commit is contained in:
ranl 2014-02-12 15:12:08 +02:00
parent 4732257530
commit 4ebcdffcf8
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/modules/solr.py
View File

@ -63,6 +63,7 @@ verbose : True
# Import python Libs
import json
import os
import urllib2
# Import salt libs
import salt.utils
@ -222,6 +223,28 @@ def _format_url(handler, host=None, core_name=None, extra=None):
host, port, baseurl, core_name, handler, "&".join(extra))
def _auth(url):
'''
Install an auth handler for urllib2
'''
user = __salt__['config.get']('solr.user', False)
password = __salt__['config.get']('solr.passwd', False)
realm = __salt__['config.get']('solr.auth_realm', 'Solr')
if user and password:
basic = urllib2.HTTPBasicAuthHandler()
basic.add_password(
realm=realm, uri=url, user=user, passwd=password
)
digest = urllib2.HTTPDigestAuthHandler()
digest.add_password(
realm=realm, uri=url, user=user, passwd=password
)
urllib2.install_opener(
urllib2.build_opener(basic, digest)
)
def _http_request(url, request_timeout=None):
'''
PRIVATE METHOD
@ -237,6 +260,7 @@ def _http_request(url, request_timeout=None):
{'success':boolean, 'data':dict, 'errors':list, 'warnings':list}
'''
_auth(url)
try:
request_timeout = __salt__['config.option']('solr.request_timeout')