diff --git a/.gitignore b/.gitignore
index 166c8edd80085914e0ba36eab45f7cf195fa9756..8f099c2a167543d488bfe008e38589c9250d9654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@
/dist/
/nbproject/private
/Kieker.WebGUI/target/
-/Kieker.WebGUI/data
\ No newline at end of file
+/Kieker.WebGUI/data
+/Kieker.WebGUI/user
+/Kieker.WebGUI/derby.log
diff --git a/Kieker.WebGUI/lib/aspectjweaver-1.5.4.LICENSE b/Kieker.WebGUI/lib/aspectjweaver-1.5.4.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..aa7cc810fa198a624c8c3de53547e33f87768c51
--- /dev/null
+++ b/Kieker.WebGUI/lib/aspectjweaver-1.5.4.LICENSE
@@ -0,0 +1,87 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index e68268b973e72b51f0a0464fdcf398a1cb5969ac..a24972f941b9c4e6aeb71701dcbdeb9bd7147b8b 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -130,6 +130,11 @@
<artifactId>derby</artifactId>
<version>10.9.1.0</version>
</dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.5.4</version>
+ </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/NewUserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/NewUserBean.java
new file mode 100644
index 0000000000000000000000000000000000000000..886efc57d0d22a19c75d366e5c3f6b8ddd4fc97c
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/NewUserBean.java
@@ -0,0 +1,47 @@
+package kieker.webgui.beans.request;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import kieker.webgui.common.Role;
+
+public class NewUserBean {
+
+ private List<Role> roles;
+ private String username;
+ private String password;
+
+ /**
+ * Creates a new instance of this bean and initializes it with empty fields. <b>Do not use this constructor. This bean is Spring managed.</b>
+ */
+ public NewUserBean() {
+ this.roles = new ArrayList<Role>();
+ this.username = "";
+ this.password = "";
+ }
+
+ public List<Role> getRoles() {
+ return this.roles;
+ }
+
+ public void setRoles(final List<Role> roles) {
+ this.roles = roles;
+ }
+
+ public String getUsername() {
+ return this.username;
+ }
+
+ public void setUsername(final String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return this.password;
+ }
+
+ public void setPassword(final String password) {
+ this.password = password;
+ }
+
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java
new file mode 100644
index 0000000000000000000000000000000000000000..debcf5897634b10cf767819168f97d463767271d
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java
@@ -0,0 +1,97 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.webgui.beans.view;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import kieker.webgui.common.IUserManagerFacade;
+import kieker.webgui.common.Role;
+import kieker.webgui.common.User;
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+/**
+ * @author Nils Christian Ehmke
+ */
+public final class CurrentUserManagementBean {
+
+ @Autowired
+ private IUserManagerFacade userManagerFacade;
+ /**
+ * This list contains all available users.
+ */
+ private List<User> users = new ArrayList<User>();
+
+ /**
+ * Default constructor. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
+ */
+ public CurrentUserManagementBean() {
+ // No code necessary
+ }
+
+ public void setUserManagerFacade(final IUserManagerFacade userManagerFacade) {
+ this.userManagerFacade = userManagerFacade;
+ }
+
+ public void addUser(final String username, final String password, final List<Role> roles) {
+ this.userManagerFacade.addUser(username, password, roles);
+ }
+
+ public void removeUser(final String username) {
+ this.userManagerFacade.removeUser(username);
+ }
+
+ public void editUser(final String username, final String password, final Role... roles) {
+ this.userManagerFacade.editUser(username, password, roles);
+ }
+
+ protected void initialialize() {
+ this.updateList();
+ }
+
+ /**
+ * Updates the list containing the available users.
+ */
+ public void updateList() {
+ this.users = this.userManagerFacade.getUsers();
+ }
+
+ /**
+ * This method delivers all available users.
+ *
+ * @return All currently available users.
+ */
+ public List<User> getUsers() {
+ return this.users;
+ }
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/IUserManagerFacade.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/IUserManagerFacade.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3ace2966720b0288a9dfb795097b37cfb105b47
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/IUserManagerFacade.java
@@ -0,0 +1,37 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.webgui.common;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+public interface IUserManagerFacade {
+
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void addUser(final String username, final String password, final List<Role> roles);
+
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void removeUser(final String username);
+
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void editUser(final String username, final String password, final Role... roles);
+
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public List<User> getUsers();
+
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/Role.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Role.java
new file mode 100644
index 0000000000000000000000000000000000000000..8819d3cb098432988fcc1fcfee2ee2a4d7a5eec3
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Role.java
@@ -0,0 +1,40 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.webgui.common;
+
+public enum Role {
+
+ ROLE_USER(1), ROLE_ADMIN(2);
+
+ private int id;
+
+ private Role(final int id) {
+ this.id = id;
+ }
+
+ public int getID() {
+ return this.id;
+ }
+
+ public static Role fromID(final int id) {
+ if (id == 2) {
+ return Role.ROLE_ADMIN;
+ } else {
+ return Role.ROLE_USER;
+ }
+ }
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/User.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/User.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b98752e66f31c779910f38ac42b2e0421841b17
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/User.java
@@ -0,0 +1,39 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.webgui.common;
+
+import java.util.List;
+
+public class User {
+
+ private final String name;
+ private final List<Role> roles;
+
+ public User(final String name, final List<Role> roles) {
+ this.name = name;
+ this.roles = roles;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public List<Role> getRoles() {
+ return this.roles;
+ }
+
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/UserManagerFacade.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/UserManagerFacade.java
index 34218c47ddb81b127ea5f61d00d3c49a08cc959f..075aee8385b7ea5d169c238814e3be1b757da907 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/UserManagerFacade.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/UserManagerFacade.java
@@ -1,22 +1,148 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
package kieker.webgui.common;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import kieker.common.logging.Log;
+import kieker.common.logging.LogFactory;
-public class UserManagerFacade {
+// FIXME @PreAuthorize annotations are not used as it seems!
+public class UserManagerFacade implements IUserManagerFacade {
+ private static final Log LOG = LogFactory.getLog(UserManagerFacade.class);
@Autowired
private DataSource dataSource;
+ private Connection connection;
+ /**
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
+ */
public UserManagerFacade() {
-
+ // No code necessary
}
- public void initialize() {}
+ /**
+ * This method initializes the object.. <b>Do not call this method manually. It will only be accessed by Spring.</b>
+ */
+ public void initialize() {
+ try {
+ this.connection = this.dataSource.getConnection();
+ } catch (final SQLException ex) {
+ UserManagerFacade.LOG.error("Could not establish database connection.", ex);
+ }
+ }
public void setDataSource(final DataSource dataSource) {
this.dataSource = dataSource;
}
+ @Override
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void addUser(final String username, final String password, final List<Role> roles) {
+ try {
+ final PreparedStatement userCmd = this.connection.prepareStatement("INSERT INTO KIEKERUser (name, password, enabled) VALUES (?, ?, True)");
+ final PreparedStatement roleCmd = this.connection.prepareStatement("INSERT INTO Userroles (name, role) VALUES (?, ?)");
+
+ userCmd.setString(1, username);
+ userCmd.setString(2, password);
+ userCmd.execute();
+
+ roleCmd.setString(1, username);
+ for (final Role role : roles) {
+ roleCmd.setInt(2, role.getID());
+ roleCmd.execute();
+ }
+ } catch (final SQLException ex) {
+ UserManagerFacade.LOG.error("Could not add user to the database.", ex);
+ }
+ }
+
+ @Override
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void removeUser(final String username) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public void editUser(final String username, final String password, final Role... roles) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ @PreAuthorize("hasRole('ROLE_ADMIN')")
+ public List<User> getUsers() {
+ final List<User> result = new ArrayList<User>();
+ ResultSet queryResult = null;
+
+ try {
+ final Map<String, User> tempMap = new TreeMap<String, User>();
+
+ final PreparedStatement getQuery = this.connection
+ .prepareStatement("select u.name, ur.role from KIEKERUser u, Userroles ur where u.name=ur.name");
+
+ // Run through all results
+ queryResult = getQuery.executeQuery();
+ while (queryResult.next()) {
+ // Get both the username and the role from the current entry
+ final String username = queryResult.getString(1);
+ final int roleID = queryResult.getInt(2);
+ final Role role = Role.fromID(roleID);
+
+ // If the user doesn't exist in our map yet, add him.
+ // In each case we add the role to the user
+ if (tempMap.containsKey(username)) {
+ tempMap.get(username).getRoles().add(role);
+ } else {
+ final List<Role> roles = new ArrayList<Role>();
+ roles.add(role);
+ tempMap.put(username, new User(username, roles));
+ }
+ }
+
+ // Now convert the map to the list
+ result.addAll(tempMap.values());
+ } catch (final SQLException ex) {
+ UserManagerFacade.LOG.error("Could not receive user list.", ex);
+ } finally {
+ try {
+ if (queryResult != null) {
+ queryResult.close();
+ }
+ } catch (final SQLException ex) {
+ UserManagerFacade.LOG.error("Could not close query result.", ex);
+ }
+ }
+
+ return result;
+ }
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/RoleStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/RoleStringConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ddb4906432cea409f9faa3a5fa4c0bb80948b0c
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/RoleStringConverter.java
@@ -0,0 +1,43 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.webgui.common.converter;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+
+import kieker.webgui.common.Role;
+
+@FacesConverter("roleStringConverter")
+public class RoleStringConverter implements Converter {
+
+ @Override
+ public Object getAsObject(final FacesContext context, final UIComponent comp, final String str) {
+ return Role.valueOf(str);
+ }
+
+ @Override
+ public String getAsString(final FacesContext context, final UIComponent comp, final Object obj) {
+ if (obj instanceof Role) {
+ return ((Role) obj).toString();
+ } else {
+ return "";
+ }
+ }
+
+}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/package-info.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d66d4494cbfd8565eb90383c1ef37e3b1c5d862
--- /dev/null
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/package-info.java
@@ -0,0 +1,21 @@
+/***************************************************************************
+ * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+/**
+ * @author Nils Christian Ehmke
+ *
+ */
+package kieker.webgui.common.converter;
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/resources/sql/test-data.sql b/Kieker.WebGUI/src/main/resources/sql/test-data.sql
index 6865913cd3566c689d05f42c279b76e996495dca..1c17b8ef9aeee3b827104badc2df042be937a5a1 100644
--- a/Kieker.WebGUI/src/main/resources/sql/test-data.sql
+++ b/Kieker.WebGUI/src/main/resources/sql/test-data.sql
@@ -1,3 +1,3 @@
-INSERT INTO Roles (ID, Role) VALUES (1, 'ROLE_USER'), (2, 'ROLE_ADMIN'), (3, 'ROLE_SUPER_ADMIN')
+INSERT INTO Roles (ID, Role) VALUES (1, 'ROLE_USER'), (2, 'ROLE_ADMIN')
INSERT INTO KIEKERUser (name, password, enabled) VALUES ('Kieker-Team', 'kieker', True), ('Kieker-User', 'kieker', True)
-INSERT INTO Userroles (name, role) VALUES ('Kieker-Team', 1), ('Kieker-User', 1), ('Kieker-Team', 2), ('Kieker-Team', 3)
\ No newline at end of file
+INSERT INTO Userroles (name, role) VALUES ('Kieker-Team', 1), ('Kieker-User', 1), ('Kieker-Team', 2)
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-config.xml
index e003f03c143a99a9bf755d51b37a2e6b229e6471..5123f93215b8b2ae9bfb84119401be7e216e36b4 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-config.xml
@@ -3,16 +3,41 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd"
+ xmlns:util="http://www.springframework.org/schema/util">
+ <!-- The database and the transaction manager. -->
<bean id="userDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
<property name="url" value="jdbc:derby:user;create=true" />
</bean>
+ <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+ <property name="dataSource" ref="userDataSource"/>
+ </bean>
+
+ <tx:advice id="txAdvice" transaction-manager="txManager">
+ <tx:attributes>
+ <!-- all methods starting with 'get' are read-only -->
+ <tx:method name="get*" read-only="true"/>
+ <!-- other methods use the default transaction settings (see below) -->
+ <tx:method name="*"/>
+ </tx:attributes>
+ </tx:advice>
+
+ <!-- ensure that the above transactional advice runs for any execution
+ of an operation defined by the UserManager interface -->
+ <aop:config>
+ <aop:pointcut id="userManagerOperation" expression="execution(* kieker.webgui.common.IUserManagerFacade.*(..))"/>
+ <aop:advisor advice-ref="txAdvice" pointcut-ref="userManagerOperation"/>
+ </aop:config>
+
<jdbc:initialize-database ignore-failures="ALL" data-source="userDataSource">
<jdbc:script location="classpath:sql/tables.sql"/>
<jdbc:script location="classpath:sql/test-data.sql"/>
@@ -136,7 +161,15 @@
<bean id="currentProjectOverviewBean" class="kieker.webgui.beans.view.CurrentProjectOverviewBean" scope="view" init-method="initialialize">
<property name="projectsBean" ref="projectsBean"/>
</bean>
+ <bean id="currentUserManagementBean" class="kieker.webgui.beans.view.CurrentUserManagementBean" init-method="initialialize" scope="view">
+ <property name="userManagerFacade" ref="userManagerFacade"/>
+ </bean>
<!-- The request scoped beans. -->
<bean id="stringBean" class="kieker.webgui.beans.request.StringBean" scope="request"/>
+ <bean id="newUserBean" class="kieker.webgui.beans.request.NewUserBean" scope="request"/>
+
+ <!-- The enums. -->
+ <util:constant id="ROLE_USER" static-field="kieker.webgui.common.Role.ROLE_USER"/>
+ <util:constant id="ROLE_ADMIN" static-field="kieker.webgui.common.Role.ROLE_ADMIN"/>
</beans>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
index c23afed5c8acbbcb7eb307cb36e26c1d09db7fd1..e91b23ff546be22b9eb4c5cbb6f7cb58d02ddd80 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
@@ -17,8 +17,8 @@
<intercept-url pattern="/templates/**" access="denyAll"/>
<!-- The admin area is only accessible by administrators. -->
- <intercept-url pattern="/pages/admin/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_SUPER_ADMIN')"/>
- <intercept-url pattern="/faces/pages/admin/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_SUPER_ADMIN')"/>
+ <intercept-url pattern="/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
+ <intercept-url pattern="/faces/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
<!-- The is the usual user area. -->
<intercept-url pattern="/pages/**" access="isAuthenticated()"/>
@@ -28,7 +28,9 @@
<logout logout-success-url="/login?state=logout" />
</http>
-
+
+ <global-method-security pre-post-annotations="enabled"/>
+
<authentication-manager>
<authentication-provider>
<jdbc-user-service data-source-ref="userDataSource"
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
index ef1b65a35ec0d9d10a4a8e22b47a55a9cdeec958..364bedb1d181742323dbf5b41a40b1bbcf92a559 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
@@ -7,22 +7,25 @@
<p:dialog id="newUserDialog" header="Neuer Benutzer" resizable="false" modal="true" widgetVar="newUserDlg">
<h:form>
-
- <h:panelGrid columnClasses="col1 , col2" columns="2" cellpadding="5">
- <h:outputText value="Benutzername: " />
- <p:inputText id="newUserInputText" value="#{stringBean.string}" style="width: 100%" />
- <h:outputText value="Benutzerrollen: " />
- <p:selectBooleanCheckbox itemLabel="Benutzer"/>
- <h:outputText value="" />
- <p:selectBooleanCheckbox itemLabel="Administrator"/>
- <h:outputText value="" />
- <p:selectBooleanCheckbox itemLabel="Super-Administrator"/>
- </h:panelGrid>
-
+ <h:panelGrid columnClasses="col1 , col2" columns="2" cellpadding="5">
+ <h:outputText value="Benutzername: " />
+ <p:inputText value="#{newUserBean.username}" style="width: 100%" />
+
+ <h:outputText value="Passwort: " />
+ <p:inputText value="#{newUserBean.password}" style="width: 100%" />
+
+
+ <h:outputText value="Benutzerrollen: " />
+ <p:selectManyCheckbox value="#{newUserBean.roles}" layout="pageDirection" converter="roleStringConverter">
+ <f:selectItem itemLabel="Benutzer" itemValue="#{ROLE_USER}" />
+ <f:selectItem itemLabel="Administrator" itemValue="#{ROLE_ADMIN}" />
+ </p:selectManyCheckbox>
+ </h:panelGrid>
+
<hr/>
<div style="text-align: right">
- <p:commandButton value="#{localizedMessages.ok}" oncomplete="newUserDlg.hide()"/>
+ <p:commandButton value="#{localizedMessages.ok}" action="#{currentUserManagementBean.addUser(newUserBean.username, newUserBean.password, rolesBean.roles)}" oncomplete="newUserDlg.hide()"/>
</div>
</h:form>
</p:dialog>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
index 20ab1c30998e564cc611871a47ad2c670bbe7e67..daca2d981c3048c3a7374e146b05562be64daf67 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
@@ -37,7 +37,7 @@
</ui:define>
<ui:define name="centerContent">
- <h:form id="projectsListForm">
+ <h:form id="projectsListForm">
<p:dataTable emptyMessage="#{localizedMessages.noRecordsFound}" rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" value="#{currentProjectOverviewBean.projects}" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" selection="#{currentProjectOverviewBean.projectName}" rowKey="#{project}" selectionMode="single">
<!-- Makes sure that rows are selected instantaneously. -->
<p:ajax event="rowSelect" listener="#{currentProjectOverviewBean.onRowSelect}" update=":menuForm" />
diff --git a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
index b74961e299406bd2ba109588bffeda8d3b4a080d..495714c4243ab5b33f0c9b3a7aa5b1aefaf34ac5 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
@@ -28,21 +28,21 @@
<p:submenu label="#{localizedMessages.file}">
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" Neuer Benutzer" onclick="newUserDlg.show()" ajax="true"/>
<p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" Benutzerliste Aktualisieren" update=":projectsListForm" action="#{currentProjectOverviewBean.updateLists()}" ajax="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" Benutzerliste Aktualisieren" update=":usersListForm" action="#{currentUserManagementBean.updateList()}" ajax="true"/>
<p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" Einstellungen" onclick="settingsDlg.show()" ajax="true"/>
</p:submenu>
</ui:define>
<ui:define name="centerContent">
- <h:form id="projectsListForm">
- <p:dataTable emptyMessage="#{localizedMessages.noRecordsFound}" rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" selectionMode="single">
+ <h:form id="usersListForm">
+ <p:dataTable value="#{currentUserManagementBean.users}" var="user" emptyMessage="#{localizedMessages.noRecordsFound}" rows="15" paginator="true" paginatorPosition="both" rowsPerPageTemplate="5,10,15,25,50" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<p:column headerText="Benutzername">
-
+ #{user.name}
</p:column>
<p:column headerText="Benutzerrollen">
-
+ #{user.roles}
</p:column>
</p:dataTable>
</h:form>