11591 user ip #1742

atarkowska · 2013-11-08T15:29:52Z

This PR allow to store IP address of the client creating omero session.

It should be tested from all our language bidings.

For example PYTHON:

import omero
from socket import gethostname, gethostbyname
ip = gethostbyname(gethostname()) 
print ip
c = omero.client(SERVER, PORT)
c.setIP(ip)
c.createSession(USERNAME, PASSWORD)
c.closeSession()

All integration tests should pass as defined here. The webclient does not yet make use of these changes.

joshmoore · 2013-11-08T16:02:07Z

@aleksandra-tarkowska : this requires a purging the DB on gretzky. I'm marking excluded for the moment. If @pwalczysko is ok with deleting all the data on gretzky for Monday, than I can unexclude. Otherwise, we can discuss Monday AM. Thanks!

jburel · 2013-11-08T16:20:37Z

We will need to check with @imunro and @melissalinkert if there is still some on-going modulo work too.

imunro · 2013-11-08T16:53:55Z

If all this means that you want to clear Gretzky then feel free to go ahead & delete anything I've got on there.

pwalczysko · 2013-11-08T17:09:11Z

Fine with clearing Gretzky. Please double check with @melissalinkert . If Purge Data option here http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/configure is used, I suppose the auto_import script will kick in - this is how it was before and do not think it changed. Would prefer to leave it so = have always some data on Gretzky, but of course change it if this is necessary for this PR.

mtbc · 2013-11-13T09:40:30Z

Keep excluded until at least November 20th (demo in Aberdeen).

mtbc · 2013-11-24T12:49:04Z

Perhaps now include and test?

joshmoore · 2013-11-25T08:15:41Z

sql/psql/OMERO5.0DEV__7/schema.sql

@@ -1866,6 +1866,7 @@
        timeToIdle int8 not null,
        timeToLive int8 not null,
        userAgent varchar(255),
+        userIP varchar(255),


Are you expecting host names as well as IPs? If not, 15 digits would suffice. It would have to be a later SQL statement to shrink the column, since we don't support specifying string widths.

I only expect IP. True will short it.

mtbc · 2014-01-21T17:33:28Z

Perhaps now include and test?

imunro · 2014-01-21T18:12:11Z

I certainly have no objection (not sure why I'm cc'd actually)

joshmoore · 2014-01-21T19:47:40Z

There are several things that will need to happen here before unexcluding:

Currently not mergeable (not sure where the conflict is)
There will need to be CI setup (new DBs, etc.)

Though we can proceed with those done, there should also be a general discussion of the target and requirements for this. What's the plan for other clients? Etc.

mtbc · 2014-01-22T08:02:16Z

Aha, thanks. For my work on import logs, etc., obviously I'll also have to adjust the DB schema, so if that's to go into 5.0.0, hopefully at the end of this month, then my question would be if I should be expecting to rebase against this merged work first, or I'll probably just introduce more conflicts that further block this PR.

joshmoore · 2014-01-27T10:19:34Z

sql/psql/OMERO5.0DEV__7/psql-footer.sql

@@ -2071,6 +2071,11 @@ create unique index originalfile_repo_path_index on originalfile (repo, path, na
 -- end ticket:2201
 --

+


This change will need to also be added to the template files under components/dsl/resources/...

atarkowska · 2014-01-27T11:40:35Z

There should be no conflicts, after changing schema, two commits https://github.com/aleksandra-tarkowska/openmicroscopy/commit/38808bea92bf93bf126e19bbf597425e09746c29 & https://github.com/aleksandra-tarkowska/openmicroscopy/commit/4221db65690c7b01333b79d74a9a0cb62dde719b were replaced by https://github.com/aleksandra-tarkowska/openmicroscopy/commit/27e0a2728bce284d9bfc443834c6d84feecad7a6

jburel · 2014-01-29T09:38:36Z

@aleksandra-tarkowska: insight already check the IP so it will be an easy addition if we go ahead.

joshmoore · 2014-01-29T13:42:54Z

sql/psql/OMERO5.1DEV__0/psql-footer.sql

@@ -2071,6 +2071,11 @@ create unique index originalfile_repo_path_index on originalfile (repo, path, na
 -- end ticket:2201
 --

+


This change will need to also make it into dsl/resources/**footer.vm

joshmoore · 2014-01-29T13:43:23Z

Sorry, @aleksandra-tarkowska : but this is still listed as "We can’t automatically merge this pull request."

atarkowska · 2014-01-30T13:33:29Z

@joshmoore is it better now?

joshmoore · 2014-01-30T13:58:45Z

PR is mergeable and footer is updated. We'll still have to schedule a re-install on trout.

atarkowska · 2014-01-31T16:00:28Z

@pwalczysko how do you feel about db re-install?

pwalczysko · 2014-01-31T16:37:38Z

We are talking trout here (=develop). As discussed with @aleksandra-tarkowska ,

happy to drop the DB and start from scratch, but not keeping the emptyi-ish DB for too long - re-population could be done by taking the old, upgraded, rich DB dump from Howe, upgrade it one more notch (as needed by this PR) and put it on the trout after the PR was tested. In this way, both the creation from scratch as well as upgrade would be tested, and I would have the rich-data DB ready.
We have to have this done well before Thurdsday, because we will use trout in Nottingham demo/workshop (cc @will-moore )

sbesson · 2014-02-07T09:44:16Z

Unexcluding.

this include get_client_ip function reading IP address from HTTP request

sbesson · 2014-03-13T13:08:47Z

@aleksandra-tarkowska: thanks. Last force push was due to the 5.0.0 sql scripts being moved rather than created. Restarted http://ci.openmicroscopy.org/view/Breaking/job/OMERO-5.1-breaking-trigger/ to test this change. Also created http://ci.openmicroscopy.org/view/Breaking/job/OMERO-5.1-breaking-upgrade/ to test the upgrade from a 5.0.0 DB for now.

atarkowska · 2014-03-13T14:31:07Z

When that PR was opened there were next patch for 5.0DEV created following db schema instruction. We do not have anything mentioned in the doc how to create deal with first schema for new version

sbesson · 2014-03-13T20:16:56Z

ALl breaking builds are green including http://ci.openmicroscopy.org/view/Breaking/job/OMERO-5.1-breaking-upgrade/12/. Altered the merge DB

[hudson@ome-c6100-3 ~]$ pg_dump -U omero -Fc -f ~/OMERO-5.1-merge-deploy-13032014-1943.db.dump OMERO-5.1-merge-deploy
[hudson@ome-c6100-3 ~]$ file ~/OMERO-5.1-merge-deploy-13032014-1943.db.dump 
/home/hudson/OMERO-5.1-merge-deploy-13032014-1943.db.dump: PostgreSQL custom database dump - v1.12-0
[hudson@ome-c6100-3 ~]$ psql -U omero OMERO-5.1-merge-deploy < /opt/hudson/workspace/OMERO-5.1-breaking-upgrade/VERSION/LAST_RELEASE/label/ome-c6100-3/OMERO.server/sql/psql/OMERO5.1DEV__0/OMERO5.0__0.sql
BEGIN
CREATE FUNCTION
 omero_assert_db_version 
-------------------------

(1 row)

DROP FUNCTION
INSERT 0 1
ALTER TABLE
UPDATE 1
                                 status                                 
------------------------------------------------------------------------
                                                                       +
                                                                       +
                                                                       +
 YOU HAVE SUCCESSFULLY UPGRADED YOUR DATABASE TO VERSION OMERO5.1DEV__0+
                                                                       +
                                                                       +

(1 row)

COMMIT
[hudson@ome-c6100-3 ~]$

breaking label removed for final inclusion in the daily merge build.

sbesson · 2014-03-14T10:24:07Z

Thanks everyone for the thorough review.

11591 user ip

atarkowska · 2014-03-14T10:51:55Z

thank you ;-)

sbesson · 2014-03-14T10:55:16Z

Ran the upgrade script on the latest DB

[hudson@ome-c6100-3 ~]$ pg_dump -U omero -Fc -f ~/OMERO-5.1-latest-deploy-14032014.db.dump OMERO-5.1-latest-deploy
[hudson@ome-c6100-3 ~]$ file ~/OMERO-5.1-latest-deploy-14032014.db.dump
/home/hudson/OMERO-5.1-latest-deploy-14032014.db.dump: PostgreSQL custom database dump - v1.12-0
[hudson@ome-c6100-3 ~]$ psql -U omero OMERO-5.1-latest-deploy < /opt/hudson/workspace/OMERO-5.1-breaking-upgrade/VERSION/LAST_RELEASE/label/ome-c6100-3/OMERO.server/sql/psql/OMERO5.1DEV__0/OMERO5.0__0.sql
BEGIN
CREATE FUNCTION
 omero_assert_db_version 
-------------------------

(1 row)

DROP FUNCTION
INSERT 0 1
ALTER TABLE
UPDATE 1
                                 status                                 
------------------------------------------------------------------------
                                                                       +
                                                                       +
                                                                       +
 YOU HAVE SUCCESSFULLY UPGRADED YOUR DATABASE TO VERSION OMERO5.1DEV__0+
                                                                       +
                                                                       +

(1 row)

COMMIT
[hudson@ome-c6100-3 ~]$

atarkowska · 2014-03-17T09:30:12Z

--no-rebase

atarkowska · 2014-03-28T14:50:26Z

It looks like server can get the IP address of the caller, but if the client is connected to the server via Glacier2, what is reported as the remote address is the Glacier2 endpoint that forwards the request, not the original endpoint of the client. See http://doc.zeroc.com/pages/viewpage.action?pageId=2523170

Ice.EndpointInfo einfo = current.con.getEndpoint().getInfo();
Ice.IPEndpointInfo ipeinfo = (Ice.IPEndpointInfo)einfo;

Ice.ConnectionInfo info = current.con.getInfo();
Ice.IPConnectionInfo ipinfo = (Ice.IPConnectionInfo)info;

mtbc mentioned this pull request Nov 8, 2013

accommodate PL/pgSQL that logs deletes #1743

Merged

joshmoore reviewed Nov 25, 2013
View reviewed changes

joshmoore reviewed Jan 27, 2014
View reviewed changes

joshmoore reviewed Jan 29, 2014
View reviewed changes

sbesson removed the exclude label Feb 7, 2014

mtbc mentioned this pull request Feb 7, 2014

fix #11877: move import logs to upload jobs instead of annotations #2055

Merged

sbesson added the exclude label Feb 7, 2014

atarkowska added 15 commits March 13, 2014 12:26

adding IP setter to the client.py

89ec834

adding IP setter to the client.java

599929c

adding IP to Constants.ice

d575999

adding ip parameter to session creation - createWithAgent, see #11519

7a970a5

assigning omero.constant.IP in client.py

77abcc3

adding IP support in the gateway

331afbc

adding IP support in the connector.py

798f92a

adding IP support in the decorator.py

ec8dba1

this include get_client_ip function reading IP address from HTTP request

adding IP support to login

1a22fab

adjusting tests

ac3a6f4

updating model schema & shrink userIP column to 15

10b556b

updating dsl/psql-footer.vm

07af393

fixing invalid alter table, adding TYPE

3517ded

fixing spelling mistake

51d31b6

removing hardcoded credentials

32f9323

atarkowska added 2 commits March 13, 2014 15:24

renaming after release

149588e

reverting 5.0 sql

d20ab63

sbesson removed the breaking label Mar 13, 2014

sbesson added a commit that referenced this pull request Mar 14, 2014

Merge pull request #1742 from aleksandra-tarkowska/11591_user_IP

9aeaa5a

11591 user ip

sbesson merged commit 9aeaa5a into ome:develop Mar 14, 2014

atarkowska deleted the 11591_user_IP branch March 14, 2014 10:51

sbesson added this to the 5.1.0-m1 milestone Oct 14, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

11591 user ip #1742

11591 user ip #1742

atarkowska commented Nov 8, 2013

joshmoore commented Nov 8, 2013

jburel commented Nov 8, 2013

imunro commented Nov 8, 2013

pwalczysko commented Nov 8, 2013

mtbc commented Nov 13, 2013

mtbc commented Nov 24, 2013

joshmoore Nov 25, 2013

atarkowska Jan 21, 2014

mtbc commented Jan 21, 2014

imunro commented Jan 21, 2014

joshmoore commented Jan 21, 2014

mtbc commented Jan 22, 2014

joshmoore Jan 27, 2014

atarkowska commented Jan 27, 2014

jburel commented Jan 29, 2014

joshmoore Jan 29, 2014

joshmoore commented Jan 29, 2014

atarkowska commented Jan 30, 2014

joshmoore commented Jan 30, 2014

atarkowska commented Jan 31, 2014

pwalczysko commented Jan 31, 2014

sbesson commented Feb 7, 2014

sbesson commented Mar 13, 2014

atarkowska commented Mar 13, 2014

sbesson commented Mar 13, 2014

sbesson commented Mar 14, 2014

atarkowska commented Mar 14, 2014

sbesson commented Mar 14, 2014

atarkowska commented Mar 17, 2014

atarkowska commented Mar 28, 2014

		@@ -2071,6 +2071,11 @@ create unique index originalfile_repo_path_index on originalfile (repo, path, na
		-- end ticket:2201
		--

11591 user ip #1742

11591 user ip #1742

Conversation

atarkowska commented Nov 8, 2013

joshmoore commented Nov 8, 2013

jburel commented Nov 8, 2013

imunro commented Nov 8, 2013

pwalczysko commented Nov 8, 2013

mtbc commented Nov 13, 2013

mtbc commented Nov 24, 2013

joshmoore Nov 25, 2013

Choose a reason for hiding this comment

atarkowska Jan 21, 2014

Choose a reason for hiding this comment

mtbc commented Jan 21, 2014

imunro commented Jan 21, 2014

joshmoore commented Jan 21, 2014

mtbc commented Jan 22, 2014

joshmoore Jan 27, 2014

Choose a reason for hiding this comment

atarkowska commented Jan 27, 2014

jburel commented Jan 29, 2014

joshmoore Jan 29, 2014

Choose a reason for hiding this comment

joshmoore commented Jan 29, 2014

atarkowska commented Jan 30, 2014

joshmoore commented Jan 30, 2014

atarkowska commented Jan 31, 2014

pwalczysko commented Jan 31, 2014

sbesson commented Feb 7, 2014

sbesson commented Mar 13, 2014

atarkowska commented Mar 13, 2014

sbesson commented Mar 13, 2014

sbesson commented Mar 14, 2014

atarkowska commented Mar 14, 2014

sbesson commented Mar 14, 2014

atarkowska commented Mar 17, 2014

atarkowska commented Mar 28, 2014