Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion odoorpc/odoo.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def __init__(
timeout=120,
version=None,
opener=None,
basic_auth=None,
):
if protocol not in ['jsonrpc', 'jsonrpc+ssl']:
txt = (
Expand All @@ -90,10 +91,13 @@ def __init__(
self._password = None
self._db = DB(self)
self._report = Report(self)
self._basic_auth = basic_auth
if self._basic_auth and len(self._basic_auth) != 3:
raise ValueError("basic_auth needs to be tuple with localhost, user, pw")
# Instanciate the server connector
try:
self._connector = rpc.PROTOCOLS[protocol](
self._host, self._port, timeout, version, opener=opener
self._host, self._port, self._basic_auth, timeout, version, opener=opener
)
except rpc.error.ConnectorError as exc:
raise error.InternalError(exc.message)
Expand Down
7 changes: 5 additions & 2 deletions odoorpc/rpc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ def __init__(
self,
host,
port=8069,
basic_auth=None,
timeout=120,
version=None,
deserialize=True,
Expand All @@ -208,16 +209,17 @@ def __init__(
cookie_jar = CookieJar()
opener = build_opener(HTTPCookieProcessor(cookie_jar))
self._opener = opener
self._proxy_json, self._proxy_http = self._get_proxies()
self._proxy_json, self._proxy_http = self._get_proxies(basic_auth)

def _get_proxies(self):
def _get_proxies(self, basic_auth):
"""Returns the :class:`ProxyJSON <odoorpc.rpc.jsonrpclib.ProxyJSON>`
and :class:`ProxyHTTP <odoorpc.rpc.jsonrpclib.ProxyHTTP>` instances
corresponding to the server version used.
"""
proxy_json = jsonrpclib.ProxyJSON(
self.host,
self.port,
basic_auth,
self._timeout,
ssl=self.ssl,
deserialize=self.deserialize,
Expand All @@ -226,6 +228,7 @@ def _get_proxies(self):
proxy_http = jsonrpclib.ProxyHTTP(
self.host,
self.port,
basic_auth,
self._timeout,
ssl=self.ssl,
opener=self._opener,
Expand Down
14 changes: 11 additions & 3 deletions odoorpc/rpc/jsonrpclib.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import random
import sys

import urllib.request
from urllib.request import HTTPPasswordMgrWithDefaultRealm, HTTPBasicAuthHandler

# Python 2
if sys.version_info[0] < 3:
from cookielib import CookieJar
Expand Down Expand Up @@ -61,16 +64,21 @@ def get_json_log_data(data):
class Proxy(object):
"""Base class to implement a proxy to perform requests."""

def __init__(self, host, port, timeout=120, ssl=False, opener=None):
def __init__(self, host, port, basic_auth=None, timeout=120, ssl=False, opener=None):
self._root_url = "{http}{host}:{port}".format(
http=(ssl and "https://" or "http://"), host=host, port=port
)
self._basic_auth = basic_auth
self._timeout = timeout
self._builder = URLBuilder(self)
self._opener = opener
if not opener:
cookie_jar = CookieJar()
self._opener = build_opener(HTTPCookieProcessor(cookie_jar))
if self._basic_auth:
passman = HTTPPasswordMgrWithDefaultRealm()
passman.add_password(None, self._basic_auth[0], self._basic_auth[1], self._basic_auth[2])
self._opener.add_handler(HTTPBasicAuthHandler(passman))

def __getattr__(self, name):
return getattr(self._builder, name)
Expand All @@ -88,9 +96,9 @@ class ProxyJSON(Proxy):
"""

def __init__(
self, host, port, timeout=120, ssl=False, opener=None, deserialize=True
self, host, port, basic_auth, timeout=120, ssl=False, opener=None, deserialize=True
):
Proxy.__init__(self, host, port, timeout, ssl, opener)
Proxy.__init__(self, host, port, basic_auth, timeout, ssl, opener)
self._deserialize = deserialize

def __call__(self, url, params=None):
Expand Down