#523 - Update authentication and authorization

BimServer/src/org/bimserver/changes/RemoveAttributeChange.java

@@ -23,11 +23,16 @@
 
 import org.bimserver.BimserverDatabaseException;
 import org.bimserver.database.BimserverLockConflictException;
+import org.bimserver.database.DatabaseSession;
+import org.bimserver.database.OldQuery;
 import org.bimserver.database.queries.QueryObjectProvider;
 import org.bimserver.database.queries.om.Query;
 import org.bimserver.database.queries.om.QueryException;
 import org.bimserver.database.queries.om.QueryPart;
 import org.bimserver.emf.PackageMetaData;
+import org.bimserver.models.store.Project;
+import org.bimserver.models.store.StorePackage;
+import org.bimserver.models.store.User;
 import org.bimserver.shared.HashMapVirtualObject;
 import org.bimserver.shared.exceptions.UserException;
 import org.eclipse.emf.ecore.EAttribute;
@@ -49,7 +54,6 @@ public RemoveAttributeChange(long oid, String attributeName, int index) {
 	@Override
 	public void execute(Transaction transaction) throws UserException, BimserverLockConflictException, BimserverDatabaseException, IOException, QueryException {
 		PackageMetaData packageMetaData = transaction.getDatabaseSession().getMetaDataManager().getPackageMetaData(transaction.getProject().getSchema());
-
 		HashMapVirtualObject object = transaction.get(oid);
 		if (object == null) {
 			Query query = new Query(packageMetaData);

BimServer/src/org/bimserver/database/actions/AddDeserializerDatabaseAction.java

@@ -1,47 +1,51 @@
-package org.bimserver.database.actions;
-
-/******************************************************************************
- * Copyright (C) 2009-2019  BIMserver.org
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
- *****************************************************************************/
-
-import org.bimserver.BimserverDatabaseException;
-import org.bimserver.database.BimserverLockConflictException;
-import org.bimserver.database.DatabaseSession;
-import org.bimserver.database.OldQuery;
-import org.bimserver.models.log.AccessMethod;
-import org.bimserver.models.store.DeserializerPluginConfiguration;
-import org.bimserver.models.store.StorePackage;
-import org.bimserver.models.store.User;
-import org.bimserver.shared.exceptions.UserException;
-import org.bimserver.webservices.authorization.Authorization;
+package org.bimserver.database.actions;
+
+/******************************************************************************
+ * Copyright (C) 2009-2019  BIMserver.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
+ *****************************************************************************/
+
+import org.bimserver.BimserverDatabaseException;
+import org.bimserver.database.BimserverLockConflictException;
+import org.bimserver.database.DatabaseSession;
+import org.bimserver.database.OldQuery;
+import org.bimserver.models.log.AccessMethod;
+import org.bimserver.models.store.DeserializerPluginConfiguration;
+import org.bimserver.models.store.StorePackage;
+import org.bimserver.models.store.User;
+import org.bimserver.models.store.UserType;
+import org.bimserver.shared.exceptions.UserException;
+import org.bimserver.webservices.authorization.Authorization;
 
 public class AddDeserializerDatabaseAction extends AddDatabaseAction<DeserializerPluginConfiguration> {
 
-	private Authorization authorization;
-
+	private Authorization authorization;
+
 	public AddDeserializerDatabaseAction(DatabaseSession databaseSession, AccessMethod accessMethod, Authorization authorization, DeserializerPluginConfiguration deserializer) {
-		super(databaseSession, accessMethod, deserializer);
+		super(databaseSession, accessMethod, deserializer);
 		this.authorization = authorization;
-	}
-
-	@Override
-	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
-		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
-		user.getUserSettings().getDeserializers().add(getIdEObject());
-		getDatabaseSession().store(user.getUserSettings());
-		return super.execute();
-	}
+	}
+
+	@Override
+	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
+		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
+		if (user.getUserType() == UserType.READ_ONLY) {
+			throw new UserException("User has no rights for this call");
+		}
+		user.getUserSettings().getDeserializers().add(getIdEObject());
+		getDatabaseSession().store(user.getUserSettings());
+		return super.execute();
+	}
 }

BimServer/src/org/bimserver/database/actions/AddInternalServiceDatabaseAction.java

@@ -1,57 +1,57 @@
-package org.bimserver.database.actions;
-
-/******************************************************************************
- * Copyright (C) 2009-2019  BIMserver.org
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
- *****************************************************************************/
-
-import org.bimserver.BimServer;
-import org.bimserver.BimserverDatabaseException;
-import org.bimserver.database.BimserverLockConflictException;
-import org.bimserver.database.DatabaseSession;
-import org.bimserver.database.OldQuery;
-import org.bimserver.models.log.AccessMethod;
-import org.bimserver.models.store.InternalServicePluginConfiguration;
-import org.bimserver.models.store.ObjectType;
-import org.bimserver.models.store.StorePackage;
-import org.bimserver.models.store.User;
-import org.bimserver.plugins.Plugin;
-import org.bimserver.shared.exceptions.UserException;
-import org.bimserver.webservices.authorization.Authorization;
+package org.bimserver.database.actions;
+
+/******************************************************************************
+ * Copyright (C) 2009-2019  BIMserver.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
+ *****************************************************************************/
+
+import org.bimserver.BimServer;
+import org.bimserver.BimserverDatabaseException;
+import org.bimserver.database.BimserverLockConflictException;
+import org.bimserver.database.DatabaseSession;
+import org.bimserver.database.OldQuery;
+import org.bimserver.models.log.AccessMethod;
+import org.bimserver.models.store.*;
+import org.bimserver.plugins.Plugin;
+import org.bimserver.shared.exceptions.UserException;
+import org.bimserver.webservices.authorization.Authorization;
 
 public class AddInternalServiceDatabaseAction extends AddDatabaseAction<InternalServicePluginConfiguration> {
 
-	private Authorization authorization;
-	private BimServer bimServer;
-
+	private Authorization authorization;
+	private BimServer bimServer;
+
 	public AddInternalServiceDatabaseAction(BimServer bimServer, DatabaseSession databaseSession, AccessMethod accessMethod, Authorization authorization, InternalServicePluginConfiguration eService) {
-		super(databaseSession, accessMethod, eService);
-		this.bimServer = bimServer;
+		super(databaseSession, accessMethod, eService);
+		this.bimServer = bimServer;
 		this.authorization = authorization;
-	}
-
-	@Override
-	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
-		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
-		InternalServicePluginConfiguration idEObject = getIdEObject();
-		idEObject.setUserSettings(user.getUserSettings());
-		Plugin plugin = bimServer.getPluginManager().getPlugin(idEObject.getPluginDescriptor().getIdentifier(), true);
-		ObjectType settings = bimServer.convertSettings(getDatabaseSession(), plugin.getUserSettingsDefinition());
-		user.getUserSettings().getServices().add(idEObject);
-		idEObject.setSettings(settings);
-		getDatabaseSession().store(user.getUserSettings());
-		return super.execute();
+	}
+
+	@Override
+	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
+		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
+		if (user.getUserType() == UserType.READ_ONLY) {
+			throw new UserException("User has no rights for this call");
+		}
+		InternalServicePluginConfiguration idEObject = getIdEObject();
+		idEObject.setUserSettings(user.getUserSettings());
+		Plugin plugin = bimServer.getPluginManager().getPlugin(idEObject.getPluginDescriptor().getIdentifier(), true);
+		ObjectType settings = bimServer.convertSettings(getDatabaseSession(), plugin.getUserSettingsDefinition());
+		user.getUserSettings().getServices().add(idEObject);
+		idEObject.setSettings(settings);
+		getDatabaseSession().store(user.getUserSettings());
+		return super.execute();
 	}
 }

BimServer/src/org/bimserver/database/actions/AddModelCompareDatabaseAction.java

@@ -1,47 +1,51 @@
-package org.bimserver.database.actions;
-
-/******************************************************************************
- * Copyright (C) 2009-2019  BIMserver.org
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
- *****************************************************************************/
-
-import org.bimserver.BimserverDatabaseException;
-import org.bimserver.database.BimserverLockConflictException;
-import org.bimserver.database.DatabaseSession;
-import org.bimserver.database.OldQuery;
-import org.bimserver.models.log.AccessMethod;
-import org.bimserver.models.store.ModelComparePluginConfiguration;
-import org.bimserver.models.store.StorePackage;
-import org.bimserver.models.store.User;
-import org.bimserver.shared.exceptions.UserException;
-import org.bimserver.webservices.authorization.Authorization;
+package org.bimserver.database.actions;
+
+/******************************************************************************
+ * Copyright (C) 2009-2019  BIMserver.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
+ *****************************************************************************/
+
+import org.bimserver.BimserverDatabaseException;
+import org.bimserver.database.BimserverLockConflictException;
+import org.bimserver.database.DatabaseSession;
+import org.bimserver.database.OldQuery;
+import org.bimserver.models.log.AccessMethod;
+import org.bimserver.models.store.ModelComparePluginConfiguration;
+import org.bimserver.models.store.StorePackage;
+import org.bimserver.models.store.User;
+import org.bimserver.models.store.UserType;
+import org.bimserver.shared.exceptions.UserException;
+import org.bimserver.webservices.authorization.Authorization;
 
 public class AddModelCompareDatabaseAction extends AddDatabaseAction<ModelComparePluginConfiguration> {
 
-	private Authorization authorization;
-
+	private Authorization authorization;
+
 	public AddModelCompareDatabaseAction(DatabaseSession databaseSession, AccessMethod accessMethod, Authorization authorization, ModelComparePluginConfiguration modelCompare) {
-		super(databaseSession, accessMethod, modelCompare);
+		super(databaseSession, accessMethod, modelCompare);
 		this.authorization = authorization;
-	}
-
-	@Override
-	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
-		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
-		user.getUserSettings().getModelCompares().add(getIdEObject());
-		getDatabaseSession().store(user.getUserSettings());
-		return super.execute();
-	}
+	}
+
+	@Override
+	public Long execute() throws UserException, BimserverLockConflictException, BimserverDatabaseException {
+		User user = getDatabaseSession().get(StorePackage.eINSTANCE.getUser(), authorization.getUoid(), OldQuery.getDefault());
+		if (user.getUserType() == UserType.READ_ONLY) {
+			throw new UserException("User has no rights for this call");
+		}
+		user.getUserSettings().getModelCompares().add(getIdEObject());
+		getDatabaseSession().store(user.getUserSettings());
+		return super.execute();
+	}
 }