/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 645

Added by bojilova almost 24 years ago

- appling acl through access files only
- clearing around update/delete of access files - to delete the related records from both xml_access and xml_relation tables
- included check for user permissions for setting acl on the resources in the access file
- moved RelationHandler.deleteRelations(docid) down in RelationHandler obj just before the write of the new relations

        private String   action = null;
        private String   docid = null;
        private String   user = null;
        private String   group = null;
        private Thread   xmlIndex;
        private boolean endDocument = false;
        private int serverCode = 1;
-...
+         }
+       }
        public DBSAXHandler(Connection conn,String action,String docid,String user,
                            int serverCode)
        public DBSAXHandler(Connection conn, String action, String docid,
                            String user, String group, int serverCode)
+       {
          this(conn);
          this.action = action;
          this.docid = docid;
          this.user = user;
          this.group = group;
          this.xmlIndex = new Thread(this);
          this.serverCode = serverCode;
+       }
-...
         * @param docid to be inserted or updated into JDBC connection
         * @param user the user connected to MetaCat servlet
         */
        public DBSAXHandler(Connection conn,String action,String docid,String user)
        public DBSAXHandler(Connection conn,String action,String docid,
                            String user, String group)
+       {
          this(conn);
          this.action = action;
          this.docid = docid;
          this.user = user;
          this.group = group;
          this.xmlIndex = new Thread(this);
          //this.xmlIndex.setPriority(Thread.MIN_PRIORITY);
+       }
-...
+          {
             DocumentImpl xmldoc = new DocumentImpl(dbconn, docid);
             String xml = xmldoc.toString();
             AccessControlList aclobj =
             new AccessControlList(dbconn,docid,null,new StringReader(xml));
             dbconn.commit();
             try {
               AccessControlList aclobj =
               new AccessControlList(dbconn, docid, new StringReader(xml),
                                     user, group);
               dbconn.commit();
             } catch (SAXException e) {
               try {
                 dbconn.rollback();
                 dbconn.close();
               } catch (SQLException sqle) {}
               System.out.println("Error writing ACL. " + e.getMessage());
+            }
+          }

                                   String group, int serverCode, boolean override)
                     throws Exception
+      {
         if(action.equals("UPDATE"))
+        {
           RelationHandler.deleteRelations(docid);
+        }
         //MOVED DOWN IN RelationHandler obj before write of relations
         //if(action.equals("UPDATE"))
         //{
         //  RelationHandler.deleteRelations(docid);
         //}
         int updaterev;
         MetaCatUtil util = new MetaCatUtil();
-...
+            {
               MetacatReplication.replLog("lock granted for " + docid + " from " +
                                           server);
               XMLReader parser = initializeParser(conn, action, newdocid, user,
                                                   serverCode, dtd);
               XMLReader parser = initializeParser(conn, action, newdocid,
                                                   user, group, serverCode, dtd);
               conn.setAutoCommit(false);
               parser.parse(new InputSource(xml));
               conn.commit();
               // if acltext is provided for @xml, store acl info into db
               if ( acl != null )
+              {
                 AccessControlList aclobj=new AccessControlList(conn,null,newdocid,acl);
                 conn.commit();
+              }
               conn.setAutoCommit(true);
+            }
             catch (Exception e)
-...
         try
+        {
           XMLReader parser=initializeParser(conn,action,newdocid,user,serverCode,dtd);
           XMLReader parser = initializeParser(conn, action, newdocid,
                                               user, group, serverCode, dtd);
           conn.setAutoCommit(false);
           parser.parse(new InputSource(xml));
           conn.commit();
           // if acltext is provided for @xml, store acl info into db
           if ( acl != null )
+          {
             AccessControlList aclobj=new AccessControlList(conn,null,newdocid,acl);
             conn.commit();
+          }
           conn.setAutoCommit(true);
+        }
         catch (Exception e)
+        {
-...
         Statement stmt = conn.createStatement();
         stmt.execute("DELETE FROM xml_index WHERE docid = '" + docid + "'");
         stmt.execute("DELETE FROM xml_documents WHERE docid = '" + docid + "'");
         stmt.execute("DELETE FROM xml_access WHERE docid = '" + docid + "'");
         stmt.execute("DELETE FROM xml_access WHERE accessfileid = '" + docid + "'");
         stmt.execute("DELETE FROM xml_relation WHERE docid = '" + docid + "'");
         stmt.close();
         conn.commit();
         conn.setAutoCommit(true);
-...
         //delete all of the relations that this document created.
         //if the deleted document is a package document its relations should
         //no longer be active if it has been deleted from the system.
         RelationHandler.deleteRelations(docid);
     //    MOVED UP IN THE TRANSACTION
     //    RelationHandler.deleteRelations(docid);
+      }
       /**
-...
        * Set up the parser handlers for writing the document to the database
        */
       private static XMLReader initializeParser(Connection conn, String action,
                                                 String docid, String user,
                                                 int serverCode, Reader dtd)
                                        String docid, String user, String group,
                                        int serverCode, Reader dtd)
                                throws Exception
+      {
         XMLReader parser = null;
-...
         // Set up the SAX document handlers for parsing
         //
         try {
           ContentHandler chandler = new DBSAXHandler(conn,action,docid,user,serverCode);
           EntityResolver eresolver= new DBEntityResolver(conn,(DBSAXHandler)chandler,dtd);
           ContentHandler chandler = new DBSAXHandler(conn, action, docid,
                                                      user, group, serverCode);
           EntityResolver eresolver= new DBEntityResolver(conn,
                                                      (DBSAXHandler)chandler, dtd);
           DTDHandler dtdhandler   = new DBDTDHandler(conn);
           // Get an instance of the parser

        */
       public void run()
+      {
         String docid = xmldoc.getDocID();
         // deletes all of the relations with a docid of @docid.
         deleteRelations(docid);
         //pseudo-code algorithm
         //for each new relation r in xml_nodes
         //  put r into xml_relation
-...
         //    add a new row to xml_relation that represents this new relation
         try
+        {
           String docid = xmldoc.getDocID();
           PreparedStatement pstmt = conn.prepareStatement(
                                     QuerySpecification.printPackageSQL(docid));
           pstmt.execute();
-...
        * Deletes all of the relations with a docid of 'docid'.
        * @param docid the docid to delete.
        */
       public static void deleteRelations(String docid)
       public void deleteRelations(String docid)
+      {
         try
+        {
           MetaCatUtil util2 = new MetaCatUtil();
           Connection conn = util2.openDBConnection();
           PreparedStatement pstmt = conn.prepareStatement("delete from " +
                                  "xml_relation where docid like '" + docid + "'");
           pstmt.execute();
           pstmt.close();
+        }
         catch(Exception e)
+        {
           try
+          {
             conn.rollback();
+          }
           catch (SQLException sqle) {}
           System.out.println("error in deleteRelations(): " + e.getMessage());
           e.printStackTrace(System.out);
+        }

       private Connection conn;
       private String parserName;
       private Stack elementStack;
       private String server;
       private boolean	processingDTD;
       private String  user;
       private String  group;
       private String  aclid;
       private String  docid;
       private String 	docname;
       private String 	doctype;
       private String 	systemid;
-...
        * @param docid the Accession# of the document with the acl data
        * @param acl the acl file containing acl data
        */
       public AccessControlList(Connection conn,String aclid,String docid,Reader acl)
       public AccessControlList(Connection conn, String aclid, Reader acl,
                                String user, String group)
                       throws SAXException, IOException, ClassNotFoundException
+      {
         // Get an instance of the parser
         MetaCatUtil util = new MetaCatUtil();
         String parserName = util.getOption("saxparser");
         this.server = util.getOption("server");
         this.conn = conn;
         this.parserName = parserName;
         this.processingDTD = false;
         this.elementStack = new Stack();
         this.user = user;
         this.group = group;
         this.aclid = aclid;
         this.docid = docid;
         this.principalName = new Vector();
         this.permission = 0;
         this.ticketCount = 0;
-...
        * @param docid the Accession# of the document with the acl data
        * @param aclfilename the name of acl file containing acl data
        */
       public AccessControlList( Connection conn, String aclid,
                                 String docid, String aclfilename )
       public AccessControlList( Connection conn, String aclid, String aclfilename,
                                String user, String group )
                       throws SAXException, IOException, ClassNotFoundException
+      {
         this(conn, aclid, docid, new FileReader(new File(aclfilename).toString()));
         this(conn, aclid, new FileReader(new File(aclfilename).toString()),
              user, group);
+      }
       /**
-...
+      }
       /**
        * callback method used by the SAX Parser when beginning of the document
        */
       public void startDocument() throws SAXException
+      {
         //delete all previously submitted permissions @ relations
         //this happens only on UPDATE of the access file
         try {
           if ( aclid != null ) {
             //first delete all permissions for resources related to @aclid if any
             deletePermissionsForRelatedResources(aclid);
             //then delete all relations with docid of @aclid if any
             deleteRelations(aclid);
+          }
         } catch (SQLException sqle) {
           throw new SAXException(sqle);
+        }
+      }
       /**
        * callback method used by the SAX Parser when the start tag of an
        * element is detected. Used in this context to parse and store
        * the acl information in class variables.
-...
         String currentTag = currentNode.getTagName();
         if (currentTag.equals("resourceIdentifier")) {
           if ( docid != null ) {
             resourceId = docid;
           } else {
             resourceURL = inputString;
             resourceId = getDocID(inputString);
             // here should be ProtocolHandler.get("docid");
           resourceURL = inputString;
           resourceId = getDocID(inputString);
           // check permissions for @user on resourceId first
           // @user must have permission "all" on resourceId
           boolean hasPermission = false;
           try {
             hasPermission = hasPermission("ALL",user,resourceId);
             if ( !hasPermission && group != null ) {
               hasPermission = hasPermission("ALL",group,resourceId);
+            }
           } catch (SQLException e) {
             throw new SAXException(e.getMessage());
+          }
           if ( !hasPermission ) {
             throw new SAXException(
              "Permission denied for setting access control on " + resourceId);
+          }
           // end of check for "all" perm on resourceId
         } else if (currentTag.equals("principalName")) {
           principalName.addElement(new String(inputString));
         } else if (currentTag.equals("permission")) {
           if ( inputString.trim().toUpperCase().equals("READ") ) {
             permission = permission | READ;
           } else if ( inputString.trim().toUpperCase().equals("WRITE") ) {
-...
           } else if ( inputString.trim().toUpperCase().equals("ALL") ) {
             permission = permission | ALL;
+          }
         } else if (currentTag.equals("duration") &&
                    beginTime == null && endTime == null ) {
           try {
-...
           } catch (StringIndexOutOfBoundsException se) {
             beginTime = inputString;
+          }
         } else if (currentTag.equals("ticketCount") && ticketCount == 0 ) {
           ticketCount = (new Integer(inputString.trim())).intValue();
+        }
-...
         if ( leaving.getTagName().equals("resourceIdentifier") ) {
           try {
             // delete all acl records for resourceId first if any
             deletePermissions();
             // make a relationship for acl file on resourceId
             // make a relationship for @aclid on @resourceId
             if ( aclid != null ) {
               insertRelation();
               insertRelation(aclid, resourceURL);
+            }
           } catch (SQLException sqle) {
             throw new SAXException(sqle);
-...
         return processingDTD;
+      }
       /** Delete from db all permission for resourceId if any */
       private void deletePermissions()
       /** Delete from db all permission for resources related to @aclid if any */
       private void deletePermissionsForRelatedResources(String aclid)
               throws SQLException
+      {
         // delete all acl records for resourceId if any
         // delete all acl records for resources related to @aclid if any
         Statement stmt = conn.createStatement();
         stmt.execute("DELETE FROM xml_access WHERE docid='" + resourceId +"'");
     //    String docURL = "metacat://" + server + "/?docid=";
     //    stmt.execute("DELETE FROM xml_access WHERE '" + docURL + "'||docid IN " +
     //                 "(SELECT object FROM xml_relation" +
     //                 " WHERE docid = '" + aclid + "'" +
     //                 " AND relationship = 'isaclfor')" );
         stmt.execute("DELETE FROM xml_access WHERE accessfileid = '" + aclid + "'");
         stmt.close();
+      }
       /** Insert relationship into db for aclid on resourceId  */
       private void insertRelation()
       /**
        * Deletes all of the relations with a docid of @docid.
        * @param docid the docid to delete.
        */
       public void deleteRelations(String docid)
               throws SQLException
+      {
         MetaCatUtil util = new MetaCatUtil();
         String server = util.getOption("server");
         String aclURL = "metacat://" + server + "?docid=" + aclid;
         Statement stmt = conn.createStatement();
         stmt.execute("DELETE FROM xml_relation WHERE docid='" + docid + "'");
         stmt.close();
+      }
       /** Insert relationship into db for @aclid on @resourceURL  */
       private void insertRelation(String aclid, String resourceURL)
               throws SQLException
+      {
         String aclURL = "metacat://" + server + "/?docid=" + aclid;
         // insert relationship
         PreparedStatement pstmt;
-...
         try {
           pstmt = conn.prepareStatement(
                   "INSERT INTO xml_access " +
                   "(docid,principal_name,permission,perm_type,perm_order," +
                   "begin_time,end_time,ticket_count) VALUES " +
                   "(?,?,?,?,?,to_date(?,'mm/dd/yy'),to_date(?,'mm/dd/yy'),?)");
                   "(docid, principal_name, permission, perm_type, perm_order," +
                   "begin_time,end_time,ticket_count, accessfileid) VALUES " +
                   "(?,?,?,?,?,to_date(?,'mm/dd/yy'),to_date(?,'mm/dd/yy'),?,?)");
           // Bind the values to the query
           pstmt.setString(1, resourceId);
           pstmt.setInt(3, permission);
-...
           pstmt.setString(5, permOrder);
           pstmt.setString(6, beginTime);
           pstmt.setString(7, endTime);
           pstmt.setString(9, aclid);
           if ( ticketCount > 0 ) {
             pstmt.setString(8, "" + ticketCount);
           } else {

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 645

Added by bojilova almost 24 years ago