Changeset 38152 for branches/eam_branches/ipp-20150405/pstamp/scripts/pstampparse.pl

Timestamp:

Apr 18, 2015, 6:27:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (updates for pstamp, remote tools, ippToPsps schema 20)

Location:

branches/eam_branches/ipp-20150405

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstampparse.pl (modified) (10 diffs)

branches/eam_branches/ipp-20150405/pstamp/scripts/pstampparse.pl

@@ -55 +55 @@
 die "invalid mode '$mode'" unless ($mode eq "list_uri") or ($mode eq "queue_job");
 die "--file is required"   unless defined($request_file_name);
-
-if ($mode ne "list_uri") {
-    die "req_id is required"  if !$req_id;
+die "req_id is required"  unless defined $req_id;
+if ($mode ne 'list_uri') {
     die "outdir is required"  if !$outdir;
-    die "product is required" if !$product;
 } else {
-    # mode eq 'list_uri' (used for parser testing)
-    # these values won't be used for anything but should be defined to avoid errors
-    $req_id  = 0;
-    $outdir  = "nowhere";
-    $product = "dummy";
+    $outdir = "somewhere" if !$outdir
 }
 
@@ -95 +89 @@
 # do not update the database
 $no_update = 1 if $mode ne "queue_job";
+
+$product = 'NULL' unless $product;
+
+
+# look up some defaults
+my $defaultAccessLevel = metadataLookupS32($ipprc->{_siteConfig}, 'PSTAMP_DEFAULT_ACCESS_LEVEL');
+if (!defined $defaultAccessLevel) {
+    warn("cannot find 'PSTAMP_DEFAULT_ACCESS_LEVEL' in site config");
+    exit ($PS_EXIT_CONFIG_ERROR);
+}
+
+# look up the default data store product.
+my $defaultDSProduct = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_DATA_STORE_PRODUCT');
+if (!defined $defaultDSProduct) {
+    # Don't panic yet that it's not defined.
+    #  exit ($PS_EXIT_CONFIG_ERROR);
+    $defaultDSProduct = ''; # set to empty string to simplify some comparisions below
+    print STDERR "Warning PSTAMP_DATA_STORE_PRODUCT not found in the site config.\n" if  $product eq 'NULL';
+}
+
+my $productIsDefault = 0;
+if ($product and $defaultDSProduct) {
+    $productIsDefault = ($product eq $defaultDSProduct);
+}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -159 +177 @@
     my $exitStatus = $error_code >> 8;
     if ($success) {
-        # -listreq succeeded duplicate request name
+        # -listreq succeeded there is already a request in the database with this name
         print STDERR "REQ_NAME $req_name has already been used\n";
         insertFakeJobForRow(undef, 0, $PSTAMP_DUP_REQUEST);
@@ -170 +188 @@
 
 
-# Adjust the label for requests coming in over the web interface
+# Adjust the label for requests coming in over the web upload interface
+# XXX: do this later based on the user information
 
 my $label_changed = 0;
+# We now use the access tabels to set the label.
+if (0) {
 if ($label and $label eq "WEB.UP") {
     my $lcname = lc($req_name);
@@ -199 +220 @@
     print "Setting label for $req_name to $label\n" if $label_changed;
 }
-
+}
+
+# XXX: update these comments
+# product passed in is either one specific to the submitting pstampDataStore or the default
+# "pstampresults"
+# Here, we need to decide whether to change that based on email 
+# WE can't use label (yet) because the PSI cgi script sets it to PSI
+# Do we ever need to use label? Is it obsolete? Check test procedures.
+
+my $productForUser;
+my $labelForUser = $label;  # for now I pass the current label for use in hacking permissions for V1 requests
+
+my $accessLevel = getUsersAccessLevel($email, \$labelForUser, \$productForUser);
+if ($accessLevel < 0) {
+    print STDERR "Data access is forbidden.\n";
+    insertFakeJobForRow(undef, 0, $PSTAMP_NOT_AUTHORIZED);
+}
+
+# if the request came through the upload channel, change it to the user's specific label
+# if any is known.
+if ($label and $label eq 'WEB.UP') {
+    if ($labelForUser) {
+        $label = $labelForUser;
+        $label_changed = 1;
+    }
+}
+
+# XXX: Think through when and if we change the product.
+# If the product is the system default, set it to the product for the user@domain. That way 
+# if the request came through a data store that target will be used.
+# We really only need to redirect the results with greater access level than the default
+if ($productIsDefault or $product eq 'NULL') {
+    if ($productForUser) {
+        $product = $productForUser;
+    }
+} else {
+    # if we don't have a product use default
+    if ($product eq 'NULL') {
+        $product = $defaultDSProduct;
+    }
+}
+
+if (!$product or $product eq 'NULL') {
+    # this will only happen if the site.config variable is missing.
+    my_die("No product found.\n", $PS_EXIT_CONFIG_ERROR);
+}
 
 {
-    # update the database with the request name. This will be used as the
-    # the fileset name in the output data store
+    # update the request's row with the new parameters.
+    # The requset name will be used to set the output fileset name in the output data store.
     my $command = "$pstamptool -updatereq -req_id $req_id  -set_name $req_name";
     $command .= " -set_username $email" if $email ne 'null';
@@ -223 +289 @@
 }
 
+if ($accessLevel < 0) {
+    exit 0;
+}
+
+
 #
 # now convert the request table to an array of metadatas
@@ -271 +342 @@
 my $num_jobs = 0;
 
-my $accessLevel = getUsersAccessLevel($email, $label);
-if ($accessLevel < 0) {
-    print STDERR "Data access forbidden.\n";
-    insertFakeJobForRow(undef, 0, $PSTAMP_NOT_AUTHORIZED);
-    exit 0;
-}
 
 foreach my $row (@$rows) {
@@ -528 +593 @@
         # avoid error from print below if $id isn't needed
         $row->{ID} = "" if !$row->{ID};
+
+        # if this user does not have unlimited access rights adjust the date cut
+        # to avoid more recent data
+        my $mjd_max;
+        # We do not adjust dates for stacks since they are not well defined enough.
+        # We'll need to filter them by accessLevel during the lookup
+        my $stage = $row->{IMG_TYPE};
+        if ($stage ne 'stack' and adjustDateCuts($row, \$mjd_max)) {
+            # if lower limit was supplied by user we can leave the value alone
+            if ($row->{MJD_MAX}) {
+                if ($row->{MJD_MAX} > $mjd_max) {
+                    print STDERR "Access rights require limiting MJD_MAX to $mjd_max\n";
+                    $row->{MJD_MAX} = $mjd_max;
+                }
+            } else {
+                # no limit supplied we silently adjust it
+                $row->{MJD_MAX} = $mjd_max;
+            }
+        }
     }
     
@@ -1178 +1262 @@
 }
 
-# Prototype function for setting access level.
-# XXX: Implement something more flexible using the database.
+# get user's access level default label and output product
 sub getUsersAccessLevel {
     my $email = shift;
-    my $label = shift;
-
+    my $r_label = shift;
+    my $r_product = shift;
+
+    # $r_label is a copy of the initial label. We change it to a user specific one
+    # if one is found.
+    my $label = $$r_label;
+
+    # default settings
+    $$r_label   =  undef;
+    $$r_product =  undef;
     my $level = -1;
 
     if (!$email) {
-        # No email provided. Eventually this will be forbidden.
-        # For now in order to temporarily continue to support the version 1 request format
+        # No email provided. 
+        # For now in order to temporarily continue to support the version 1 request format.
         # set the access rights based on the assigned label.
+        # Before deployment this will be forbidden.
         if ($label eq 'IFA' or $label eq 'QUB' or $label =~ 'MOPS') {
-            $level = 0;
+            $level = 2;
         } else {
-            # access rights PS1 data only
-            $level = 1;
+            $level = $defaultAccessLevel;
+        }
+        return $level
+    }
+
+    # we've got an email check the domain
+    my ($user, $domain) = split '@', $email;
+    unless ($user and $domain) {
+        print STDERR "Error $email is not an acceptable email adddress.\n";
+        return -1;
+    } 
+
+    my $cmd = "$pstamptool -listuser -user $user -domain $domain";
+    my $results = runToolAndParse($cmd, $verbose);
+    my $userinfo = $results->[0];
+    if ($userinfo) {
+        $level = $userinfo->{accessLevel};
+        if ($userinfo->{userProduct}) {
+            $$r_product = $userinfo->{userProduct};
+        } elsif ($userinfo->{domainProduct}) {
+            $$r_product = $userinfo->{domainProduct};
+        }
+        if ($userinfo->{userLabel}) {
+            $$r_label = $userinfo->{userLabel};
+        } elsif ($userinfo->{domainLabel}) {
+            $$r_label = $userinfo->{domainLabel};
         }
     } else {
-        # we've got an email check the domain
-        my ($user, $domain) = split '@', $email;
-        if ($domain) {
-            $domain = lc($domain);
-            if ($domain eq 'ifa.hawaii.edu' or $domain eq 'qub.ac.uk') {
-                $level = 0;
-            } else {
-                # XXX check for special users
-                # access rights PS1 data only
-                $level = 1;
-            }
-        } else {
-            print STDERR "Error: $email is not a valid email address\n";
+        my $cmd = "$pstamptool -listdomain -domain $domain";
+        my $results = runToolAndParse($cmd, $verbose);
+        my $domaininfo = $results->[0];
+        if ($domaininfo) {
+            $level = $domaininfo->{accessLevel};
+            if ($domaininfo->{defaultProduct}) {
+                $$r_product = $domaininfo->{defaultProduct};
+            }
+            if ($domaininfo->{defaultLabel}) {
+                $$r_label = $domaininfo->{defaultLabel};
+            }
+    } else {
+            # no specific user or domain information found in the database. Use the defaults
+            $level = $defaultAccessLevel;
+            $$r_label =  undef;
+            $$r_product =  undef;
         }
     }
@@ -1225 +1344 @@
 
     my $MJD_PS1_BEGIN = 54922;    # 2009-04-01
-    my $MJD_PS1_END   = 56838;    # 2014-06-30      XXX get the actual date
+    my $MJD_PS1_END   = 57082;    # 2015-03-01
 
     if ($row->{accessLevel} == 1) {