|
 |
5b927c6 |
From 452cf473923e68c9a530573f592f7e7d29922890 Mon Sep 17 00:00:00 2001
|
|
|
5b927c6 |
From: Ralph Bean <rbean@redhat.com>
|
|
|
5b927c6 |
Date: Sep 15 2017 16:50:51 +0000
|
|
|
5b927c6 |
Subject: Make ldap3 optional, to workaround packaging issues.
|
|
|
5b927c6 |
|
|
|
5b927c6 |
|
|
|
5b927c6 |
---
|
|
|
5b927c6 |
|
|
|
5b927c6 |
diff --git a/module_build_service/auth.py b/module_build_service/auth.py
|
|
|
5b927c6 |
index 1b7c024..0c23729 100644
|
|
|
5b927c6 |
--- a/module_build_service/auth.py
|
|
|
5b927c6 |
+++ b/module_build_service/auth.py
|
|
|
5b927c6 |
@@ -38,12 +38,16 @@ try:
|
|
|
5b927c6 |
except ImportError:
|
|
|
5b927c6 |
from flask import _request_ctx_stack as stack
|
|
|
5b927c6 |
from werkzeug.exceptions import Unauthorized as FlaskUnauthorized
|
|
|
5b927c6 |
-import ldap3
|
|
|
5b927c6 |
from dogpile.cache import make_region
|
|
|
5b927c6 |
|
|
|
5b927c6 |
from module_build_service.errors import Unauthorized, Forbidden
|
|
|
5b927c6 |
from module_build_service import app, log, conf
|
|
|
5b927c6 |
|
|
|
5b927c6 |
+try:
|
|
|
5b927c6 |
+ import ldap3
|
|
|
5b927c6 |
+except ImportError:
|
|
|
5b927c6 |
+ log.warn("ldap3 import not found. ldap/krb disabled.")
|
|
|
5b927c6 |
+
|
|
|
5b927c6 |
|
|
|
5b927c6 |
client_secrets = None
|
|
|
5b927c6 |
region = make_region().configure('dogpile.cache.memory')
|
|
|
5b927c6 |
|