public inbox for [email protected]  

help / color / mirror / Atom feed

From: Khushboo Vashi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos
Date: Wed, 20 Jan 2021 16:38:18 +0530
Message-ID: <CAFOhELe7FaEWBqbipTbU0OKKVz0YBnOf-nBjywboM+UQX9y_LQ@mail.gmail.com> (raw)

Hi,

Please find the attached patch to add the RPM/DEB dependency for Kerberos
to the -server package rather than -web packages and to handle the OSError
while importing the gssapi.

Thanks,
Khushboo


Attachments:

  [application/octet-stream] kerberos_dep.patch (3.1K, 3-kerberos_dep.patch)
  download | inline diff:
diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh
index 810e9c868..ac7a08309 100755
--- a/pkg/debian/build.sh
+++ b/pkg/debian/build.sh
@@ -35,7 +35,7 @@ cat << EOF > "${SERVERROOT}/DEBIAN/control"
 Package: ${APP_NAME}-server
 Version: ${APP_LONG_VERSION}
 Architecture: ${OS_ARCH}
-Depends: python3, libpq5 (>= 11.0)
+Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
 Recommends: postgresql-client | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
 Maintainer: pgAdmin Development Team <[email protected]>
 Description: The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -76,7 +76,7 @@ cat << EOF > "${WEBROOT}/DEBIAN/control"
 Package: ${APP_NAME}-web
 Version: ${APP_LONG_VERSION}
 Architecture: all
-Depends: ${APP_NAME}-server, apache2, libapache2-mod-wsgi-py3, libgssapi-krb5-2
+Depends: ${APP_NAME}-server, apache2, libapache2-mod-wsgi-py3
 Maintainer: pgAdmin Development Team <[email protected]>
 Description: The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
 EOF
diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh
index 48be6e549..ca1eb20a6 100755
--- a/pkg/redhat/build.sh
+++ b/pkg/redhat/build.sh
@@ -52,7 +52,7 @@ Summary:	The core server package for pgAdmin.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
 
-Requires:	python3, postgresql-libs >= 11
+Requires:	python3, postgresql-libs >= 11, krb5-libs
 
 %description
 The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -131,9 +131,9 @@ Summary:	The web interface for pgAdmin, hosted under Apache HTTPD.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
 %if 0%{?rhel} && 0%{?rhel} == 7
-Requires:	${APP_NAME}-server, httpd, pgadmin4-python3-mod_wsgi, krb5-libs
+Requires:	${APP_NAME}-server, httpd, pgadmin4-python3-mod_wsgi
 %else
-Requires:	${APP_NAME}-server, httpd, python3-mod_wsgi, krb5-libs
+Requires:	${APP_NAME}-server, httpd, python3-mod_wsgi
 %endif
 
 %description
diff --git a/web/pgadmin/authenticate/kerberos.py b/web/pgadmin/authenticate/kerberos.py
index 5e03499b3..57aa1e0f0 100644
--- a/web/pgadmin/authenticate/kerberos.py
+++ b/web/pgadmin/authenticate/kerberos.py
@@ -35,6 +35,11 @@ except ImportError:
     # Instead throw the runtime error, when the server attempts
     # to use this authentication method.
     KERBEROS_AUTH_AVAILABLE = False
+except OSError:
+    # On Windows, it fails with OSError, when KFW libraries not found.
+    # Instead throw the runtime error, when the server attempts
+    # to use this authentication method.
+    KERBEROS_AUTH_AVAILABLE = False
 
 # Set the Kerberos config file
 if config.KRB_KTNAME and config.KRB_KTNAME != '<KRB5_KEYTAB_FILE>':

view thread (2+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [pgAdmin4][Patch] - RPM/DEB dependency for Kerberos
  In-Reply-To: <CAFOhELe7FaEWBqbipTbU0OKKVz0YBnOf-nBjywboM+UQX9y_LQ@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox