Commit 802fe032 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Changes for using RAP tokens and GMS groups

parent e7fd3b7b

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ build_extension: 
    - cd vollt

    - gradle jar

    - cd ../private-rows-extension

    - mvn clean package

    - JAVA_HOME=/usr/lib/jvm/java-14-openjdk-amd64 mvn clean package

  artifacts:

    paths:

      - private-rows-extension/target/private-rows-extension-*.jar

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM tomcat:9-jdk8

FROM tomcat:9-jdk14

ADD war/tap.war /usr/local/tomcat/webapps/

README.md

+5 −7
Original line number Diff line number Diff line
@@ -11,17 +11,15 @@ If you experience issues with the pull command use this setting in `/etc/docker/ 


## Demo



    ./call-tap.sh badtoken

Login to [RAP token issuer](https://sso.ia2.inaf.it/rap-ia2) to retrieve a valid JWT (select GMS service from dropdown menu).



Only free records (2 rows)

    ./call-tap.sh



    ./call-tap.sh token1

Returns only free records (2 rows)



Free records + records associated with group1 and group2 (6 rows)

    ./call-tap.sh <JWT>



    ./call-tap.sh token2



Free records + records associated with group2 (4 rows)

Returns records associated with user groups retrieved from GMS



## Shutdown

call-tap.sh

+17 −12
Original line number Diff line number Diff line 
#!/bin/bash



if [ "$#" -ne 1 ]; then

    echo "Usage: $0 <token>"

    exit 1

fi



if [ "$#" -eq 1 ]; then

    curl -s -XPOST \

            -H "Authorization: Bearer $1" \

            -F 'REQUEST=doQuery' \
@@ -13,3 +9,12 @@ curl -s -XPOST \ 
            -F 'PHASE=RUN' \

            -F "QUERY=SELECT * from demo.private_rows;" \

            http://localhost:8080/tap/sync

else

    curl -s -XPOST \

            -F 'REQUEST=doQuery' \

            -F 'LANG=ADQL' \

            -F 'FORMAT=text/csv' \

            -F 'PHASE=RUN' \

            -F "QUERY=SELECT * from demo.private_rows;" \

            http://localhost:8080/tap/sync

fi

database/01-init.sql

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ CREATE TABLE demo.private_rows ( 


INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value1', 'FREE', '');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value2', 'FREE', '');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value3', 'PRIV', 'group1');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value4', 'PRIV', 'group1');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value5', 'PRIV', 'group2');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value6', 'PRIV', 'group2');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value3', 'PRIV', 'VLKB.group1');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value4', 'PRIV', 'VLKB.group1');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value5', 'PRIV', 'VLKB.group2');

INSERT INTO demo.private_rows (value, policy, "group") VALUES ('value6', 'PRIV', 'VLKB.group2');



-- WARNING: always create a new role because Row Level Security doesn't work for table owner

CREATE ROLE tap WITH LOGIN PASSWORD 'demo';