pgAdmin 4 commit: Appropriately set the cookie path. Fixes #3197

2018-03-19 Thread Dave Page
Appropriately set the cookie path. Fixes #3197

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=534f1f35fea9ffd3f1757fd3106fbee812dcfc88
Author: Khushboo Vashi 

Modified Files
--
web/config.py   |  7 +++
web/pgAdmin4.py |  4 
web/pgadmin/__init__.py | 10 --
web/pgadmin/browser/__init__.py |  8 +++-
web/pgadmin/preferences/__init__.py |  9 -
web/pgadmin/utils/paths.py  | 11 +++
web/regression/runtests.py  |  1 +
7 files changed, 46 insertions(+), 4 deletions(-)



[pgadmin4][patch] Update karma to 2.0 #3222

2018-03-19 Thread Joao De Almeida Pereira
Hi Hackers,
Attached you can find the patch that updates karma to 2.0 and also other
plugins from karma.

The only plugins that are not updated are the jasmine ones because we are
waiting on the support for jasmine 3.0 on karma-jasmine

Thanks
Joao


karma-plugins-update.diff
Description: Binary data


Re: Proposal for changes in official Docker image

2018-03-19 Thread Dave Page
Hi

On Mon, Mar 19, 2018 at 11:19 AM, Dave Page  wrote:

> Hi
>
> On Fri, Mar 16, 2018 at 8:52 PM, Максим Кольцов 
> wrote:
>>
>>
>> I've switched to Gunicorn, adding SSL support. It has the same
>> interface as the original container: PGADMIN_ENABLE_TLS,
>> /certs/server.key and /certs/server.cert.
>> I also incorporated building of sphinx manual in Dockerfile, so now
>> the image should be complete.
>>
>
> Nice!
>
>
>>
>> I noticed that I can't use gunicorn forking worker with pgadmin4, this
>> is probably caused by session implementation, but I'm not sure. You
>> can investigate this by using e.g. `-w 4` in entrypoint.sh, otherwise
>> it's working fine with single-process threaded worker.
>>
>
> This is expected, and the reason why is explained here:
> https://www.pgadmin.org/docs/pgadmin4/2.x/server_
> deployment.html#requirements
>
>
>>
>> I will make my work into a patch and send it to the mail list soon.
>> Meanwhile, it'd be great if you tested the updated image at
>> https://hub.docker.com/r/maksbotan/pgadmin4/
>
>
> I'll try to take a look later in the week (busy prepping for a release at
> the moment).
>

I actually found some time for this today. It's looking pretty good - TLS
vs. non-TLS seems to work well. The couple of things I did notice were:

- PGADMIN_SERVER_NAME doesn't appear to be supported. This was added at
user request, for security reasons (to help ensure the connection is going
where expected). I'm not entirely convinced of the value of that, but if
it's fairly painless to add, it may well be worth it.

- If you don't map /var/lib/pgadmin (in my case, to a directory already
containing a config), then I was seeing the following error. I would expect
it to init within the container if the config directory isn't mapped:

piranha:web dpage$ docker logs affectionate_spence
sh: -z: unknown operand
NOTE: Configuring authentication for SERVER mode.

Enter the email address and password to use for the initial pgAdmin user
account:

Traceback (most recent call last):
  File "run_pgadmin.py", line 4, in 
from pgAdmin4 import app
  File "/pgadmin4/pgAdmin4.py", line 67, in 
app = create_app()
  File "/pgadmin4/pgadmin/__init__.py", line 306, in create_app
db_upgrade(app)
  File "/pgadmin4/pgadmin/setup/db_upgrade.py", line 25, in db_upgrade
flask_migrate.upgrade(migration_folder)
  File "/usr/local/lib/python3.6/site-packages/flask_migrate/__init__.py",
line 244, in upgrade
command.upgrade(config, revision, sql=sql, tag=tag)
  File "/usr/local/lib/python3.6/site-packages/alembic/command.py", line
254, in upgrade
script.run_env()
  File "/usr/local/lib/python3.6/site-packages/alembic/script/base.py",
line 427, in run_env
util.load_python_file(self.dir, 'env.py')
  File "/usr/local/lib/python3.6/site-packages/alembic/util/pyfiles.py",
line 81, in load_python_file
module = load_module_py(module_id, path)
  File "/usr/local/lib/python3.6/site-packages/alembic/util/compat.py",
line 83, in load_module_py
spec.loader.exec_module(module)
  File "/pgadmin4/pgadmin/setup/../../migrations/env.py", line 94, in

run_migrations_online()
  File "/pgadmin4/pgadmin/setup/../../migrations/env.py", line 87, in
run_migrations_online
context.run_migrations()
  File "", line 8, in run_migrations
  File
"/usr/local/lib/python3.6/site-packages/alembic/runtime/environment.py",
line 836, in run_migrations
self.get_context().run_migrations(**kw)
  File
"/usr/local/lib/python3.6/site-packages/alembic/runtime/migration.py", line
330, in run_migrations
step.migration_fn(**kw)
  File "/pgadmin4/migrations/versions/fdc58d9bd449_.py", line 112, in
upgrade
email, password = user_info()
  File "/pgadmin4/pgadmin/setup/user_info.py", line 55, in user_info
email = input("Email address: ")
EOFError: EOF when reading a line
[2018-03-19 14:50:59 +] [1] [INFO] Starting gunicorn 19.7.1
[2018-03-19 14:50:59 +] [1] [INFO] Listening at: http://0.0.0.0:8080 (1)
[2018-03-19 14:50:59 +] [1] [INFO] Using worker: threads
[2018-03-19 14:50:59 +] [14] [INFO] Booting worker with pid: 14
[2018-03-19 14:50:59 +] [14] [ERROR] Exception in worker process
Traceback (most recent call last):
  File "/usr/local/lib/python3.6/site-packages/gunicorn/arbiter.py", line
578, in spawn_worker
worker.init_process()
  File
"/usr/local/lib/python3.6/site-packages/gunicorn/workers/gthread.py", line
109, in init_process
super(ThreadWorker, self).init_process()
  File "/usr/local/lib/python3.6/site-packages/gunicorn/workers/base.py",
line 126, in init_process
self.load_wsgi()
  File "/usr/local/lib/python3.6/site-packages/gunicorn/workers/base.py",
line 135, in load_wsgi
self.wsgi = self.app.wsgi()
  File "/usr/local/lib/python3.6/site-packages/gunicorn/app/base.py", line
67, in wsgi
self.callable = self.load()
  File "/usr/local/lib/python3.6/site-packages/gunicorn/app/wsgiapp.py",
line 65, in load
return 

Re: [pgAdmin4][RM#3200] Don't set empty string for host/hostaddr in model when service is used

2018-03-19 Thread Dave Page
Thanks, applied.

On Mon, Mar 19, 2018 at 10:07 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue where pgAdmin4 was not able to utilise the host
> parameter from service file.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


pgAdmin 4 commit: Ensure the host parameter is correctly pickup up from

2018-03-19 Thread Dave Page
Ensure the host parameter is correctly pickup up from the service file. Fixes 
#3200

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=34f1ebc88eb3044f129c84698551844097849310
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/browser/server_groups/servers/__init__.py   |  4 ++--
.../browser/server_groups/servers/model_validation.js   | 14 ++
.../server_groups/servers/model_validation_spec.js  | 17 +
3 files changed, 33 insertions(+), 2 deletions(-)



Re: french translation for 3.0 release

2018-03-19 Thread Dave Page
Thanks - committed!

On Sun, Mar 18, 2018 at 4:41 PM,  wrote:

>
> hi
> french translation (almost) completed !
> for commit
> thanks
> fred
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


Re: Proposal for changes in official Docker image

2018-03-19 Thread Dave Page
Hi

On Fri, Mar 16, 2018 at 8:52 PM, Максим Кольцов  wrote:
>
>
> I've switched to Gunicorn, adding SSL support. It has the same
> interface as the original container: PGADMIN_ENABLE_TLS,
> /certs/server.key and /certs/server.cert.
> I also incorporated building of sphinx manual in Dockerfile, so now
> the image should be complete.
>

Nice!


>
> I noticed that I can't use gunicorn forking worker with pgadmin4, this
> is probably caused by session implementation, but I'm not sure. You
> can investigate this by using e.g. `-w 4` in entrypoint.sh, otherwise
> it's working fine with single-process threaded worker.
>

This is expected, and the reason why is explained here:
https://www.pgadmin.org/docs/pgadmin4/2.x/server_deployment.html#requirements


>
> I will make my work into a patch and send it to the mail list soon.
> Meanwhile, it'd be great if you tested the updated image at
> https://hub.docker.com/r/maksbotan/pgadmin4/


I'll try to take a look later in the week (busy prepping for a release at
the moment).

-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


pgAdmin 4 commit: Pass the service name to external processes. Fixes #3

2018-03-19 Thread Dave Page
Pass the service name to external processes. Fixes #3195

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c312b03f6f8b61cf5e77cac019af2145db15f9f5
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/misc/bgprocess/processes.py | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)



Re: [pgAdmin4][RM#3195] Include service name when executing Backup, Restore etc tools

2018-03-19 Thread Dave Page
Thanks, applied.

On Thu, Mar 15, 2018 at 4:15 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch which will allow tools to pickup Service name properly.
> Please review.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


[pgAdmin4][RM#3200] Don't set empty string for host/hostaddr in model when service is used

2018-03-19 Thread Murtuza Zabuawala
Hi,

PFA patch to fix the issue where pgAdmin4 was not able to utilise the host
parameter from service file.

--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


RM_3200.diff
Description: Binary data


Re: [pgAdmin4][RM#3219] Update Chrome web driver

2018-03-19 Thread Dave Page
Thanks, applied.

On Mon, Mar 19, 2018 at 10:02 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to update chrome web driver to latest version because newer
> version of Chrome is no longer compatible with it.
>
> Steps:
> 1) activate virtual env
> 2) pip uninstall chromedriver_installer
> 3) apply patch
> 4) pip install -r regression/requirements.txt
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


pgAdmin 4 commit: Update required ChromeDriver version for current vers

2018-03-19 Thread Dave Page
Update required ChromeDriver version for current versions of Chrome. Fixes #3219

This requires an update to build/test envs:

pip uninstall chromedriver_installer
pip install -r regression/requirements.txt

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=48319d56df0a252861602a2439c7ad91af29d4a0
Author: Murtuza Zabuawala 

Modified Files
--
web/regression/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



[pgAdmin4][RM#3219] Update Chrome web driver

2018-03-19 Thread Murtuza Zabuawala
Hi,

PFA patch to update chrome web driver to latest version because newer
version of Chrome is no longer compatible with it.

Steps:
1) activate virtual env
2) pip uninstall chromedriver_installer
3) apply patch
4) pip install -r regression/requirements.txt


--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


RM_3219.diff
Description: Binary data