/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 7680

Added by Jing Tao over 11 years ago

Use the set of subjects to replace the user and groups for the solr query.

     import java.util.ArrayList;
     import java.util.Calendar;
     import java.util.Date;
     import java.util.HashSet;
     import java.util.List;
     import java.util.Set;
     import java.util.Timer;
-...
     			NotFound {
     	    String user = Constants.SUBJECT_PUBLIC;
             String[] groups= null;
             Set<Subject> subjects = null;
             if (session != null) {
                 user = session.getSubject().getValue();
                 Set<Subject> subjects = AuthUtils.authorizedClientSubjects(session);
                 subjects = AuthUtils.authorizedClientSubjects(session);
                 if (subjects != null) {
                     List<String> groupList = new ArrayList<String>();
                     for (Subject subject: subjects) {
-...
+                    }
                     groups = groupList.toArray(new String[0]);
+                }
             } else {
                 //add the public user subject to the set
                 Subject subject = new Subject();
                 subject.setValue(Constants.SUBJECT_PUBLIC);
                 subjects = new HashSet();
                 subjects.add(subject);
+            }
             //System.out.println("====== user is "+user);
             //System.out.println("====== groups are "+groups);
     		if (engine != null && engine.equals(PATHQUERY)) {
     			try {
     				DBQuery queryobj = new DBQuery();
-...
     		    logMetacat.info("The query is ==================================== \n"+query);
     		    try {
                     return MetacatSolrIndex.getInstance().query(query, user, groups);
                     return MetacatSolrIndex.getInstance().query(query, subjects);
                 } catch (Exception e) {
                     // TODO Auto-generated catch block
                     throw new ServiceFailure("Solr server error", e.getMessage());

     import java.util.Hashtable;
     import java.util.List;
     import java.util.Map;
     import java.util.Set;
     import javax.xml.parsers.ParserConfigurationException;
-...
     import org.apache.solr.schema.SchemaField;
     import org.apache.solr.servlet.SolrRequestParsers;
     import org.dataone.configuration.Settings;
     import org.dataone.service.types.v1.Subject;
     import org.dataone.service.types.v1_1.QueryEngineDescription;
     import org.dataone.service.types.v1_1.QueryField;
     import org.dataone.service.util.Constants;
-...
         /**
          * Query the solr server
          * @param query  the solr query
          * @param authorizedSubjects the authorized subjects in this query session
          * @return the result as the InputStream
          * @throws SolrServerException
          * @throws ClassNotFoundException
          * @throws SQLException
          * @throws PropertyNotFoundException
          */
         public InputStream query(String query, String user, String[] groups) throws SolrServerException, IOException, PropertyNotFoundException, SQLException, ClassNotFoundException {
         public InputStream query(String query, Set<Subject>authorizedSubjects) throws SolrServerException, IOException, PropertyNotFoundException, SQLException, ClassNotFoundException {
             if(authorizedSubjects == null || authorizedSubjects.isEmpty()) {
                 throw new SolrServerException("MetacatSolrIndex.query - There is no any authorized subjects(even the public user) in this query session.");
+            }
             if(isEmbeddedSolrServer) {
                 return queryEmbedded(query, user, groups);
                 return queryEmbedded(query, authorizedSubjects);
             } else {
                 return queryHttp(query, user, groups);
                 return queryHttp(query, authorizedSubjects);
+            }
+        }
         /**
-...
          * @throws SQLException
          * @throws PropertyNotFoundException
          */
         private InputStream queryEmbedded(String query, String user, String[] groups) throws SolrServerException, IOException, PropertyNotFoundException, SQLException, ClassNotFoundException {
         private InputStream queryEmbedded(String query, Set<Subject>subjects) throws SolrServerException, IOException, PropertyNotFoundException, SQLException, ClassNotFoundException {
             InputStream inputStream = null;
             SolrParams solrParams = SolrRequestParsers.parseQueryString(query);
             solrParams = appendAccessFilterParams(solrParams, user, groups);
             solrParams = appendAccessFilterParams(solrParams, subjects);
             String wt = solrParams.get(WT);
             // handle normal and skin-based queries
-...
          * which is not available for the SolrHttpServer.
+         *
          */
         private InputStream queryHttp(String query, String user, String[] groups) throws IOException {
             StringBuffer accessFilter = generateAccessFilterParamsString(user, groups);
         private InputStream queryHttp(String query, Set<Subject>subjects) throws IOException {
             StringBuffer accessFilter = generateAccessFilterParamsString(subjects);
             if(accessFilter != null && accessFilter.length() != 0) {
                 query = solrBaseURL+"/select?"+query+"&"+FILTERQUERY+"="+accessFilter.toString();
+            }
-...
         /*
          * Append the access filter query to the params
          */
         private SolrParams appendAccessFilterParams(SolrParams solrParams, String user, String[] groups) {
         private SolrParams appendAccessFilterParams(SolrParams solrParams, Set<Subject>subjects) {
             SolrParams append = null;
             if(solrParams != null) {
                 StringBuffer query = generateAccessFilterParamsString(user, groups);
                 StringBuffer query = generateAccessFilterParamsString(subjects);
                 if(query != null && query.length() != 0) {
                     log.info("=================== fq query is "+query.toString());
                     NamedList fq = new NamedList();
-...
             return append;
+        }
         private StringBuffer generateAccessFilterParamsString(String user, String[] groups) {
         private StringBuffer generateAccessFilterParamsString(Set<Subject>subjects) {
             StringBuffer query = new StringBuffer();
             if (user != null && groups != null) {
                     query.append(OPENPARENTHESE+READPERMISSION+COLON+"\""+user+"\""+CLOSEPARENTHESE);
                     if(!user.equals(Constants.SUBJECT_PUBLIC)) {
                         query.append(OR+OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+user+"\""+CLOSEPARENTHESE);
+                    }
                     for(int i=0; i<groups.length; i++) {
                         if(groups[i] != null) {
                             query.append(OR + OPENPARENTHESE+READPERMISSION+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
                             if(!groups[i].equals(Constants.SUBJECT_PUBLIC)) {
                                 query.append(OR + OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
+                            }
+                        }
+                    }
             } else if (user != null && groups == null) {
                 query.append(OPENPARENTHESE+READPERMISSION+COLON+"\""+user+"\""+CLOSEPARENTHESE);
                 if(!user.equals(Constants.SUBJECT_PUBLIC)) {
                     query.append(OR+OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+user+"\""+CLOSEPARENTHESE);
+                }
             } else if ( user == null && groups != null) {
                     for (int i=0; i<groups.length; i++) {
                         if(groups[i]!= null) {
                             if(i==0) {
                                 query.append(OPENPARENTHESE+READPERMISSION+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
                                 if(!groups[i].equals(Constants.SUBJECT_PUBLIC)) {
                                     query.append(OR + OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
             if(subjects != null) {
                 for(Subject subject : subjects) {
                     if(subject != null) {
                         String subjectName = subject.getValue();
                         if(subjectName != null && !subjectName.trim().equals("")) {
                             boolean first = true;
                             if(first) {
                                 first = false;
                                 query.append(OPENPARENTHESE+READPERMISSION+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
                                 if(!subjectName.equals(Constants.SUBJECT_PUBLIC)) {
                                     query.append(OR+OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
+                                }
                             } else {
                                 query.append(OR + OPENPARENTHESE+READPERMISSION+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
                                 if(!groups[i].equals(Constants.SUBJECT_PUBLIC)) {
                                     query.append(OR + OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+groups[i]+"\""+CLOSEPARENTHESE);
                                 query.append(OR + OPENPARENTHESE+READPERMISSION+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
                                 if(!subjectName.equals(Constants.SUBJECT_PUBLIC)) {
                                     query.append(OR + OPENPARENTHESE+RIGHTSHOLDER+COLON+"\""+subjectName+"\""+CLOSEPARENTHESE);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             return query;
+        }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 7680

Added by Jing Tao over 11 years ago