From 07fdc590a8fa8750999fab115e370c29dae306e6 Mon Sep 17 00:00:00 2001 From: John Arthorne Date: Fri, 28 Jan 2011 14:35:30 -0500 Subject: [PATCH 1/2] Bug 335699 - [admin] Need to create an admin account in the user storage --- .../META-INF/MANIFEST.MF | 3 ++- .../user/securestorage/SecureStorageUserAdmin.java | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF b/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF index 9fe9126..ba3bbe3 100644 --- a/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.orion.server.user.securestorage/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.orion.server.useradmin;bundle-version="0.1.0", org.eclipse.core.runtime;bundle-version="3.6.100", org.eclipse.orion.server.core;bundle-version="0.1.0", - org.eclipse.equinox.security;bundle-version="1.1.0" + org.eclipse.equinox.security;bundle-version="1.1.0", + org.eclipse.orion.server.servlets;bundle-version="0.1.0" Export-Package: org.eclipse.orion.internal.server.user.securestorage;x-internal:=true diff --git a/bundles/org.eclipse.orion.server.user.securestorage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java b/bundles/org.eclipse.orion.server.user.securestorage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java index 73e829b..9d6c00d 100644 --- a/bundles/org.eclipse.orion.server.user.securestorage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java +++ b/bundles/org.eclipse.orion.server.user.securestorage/src/org/eclipse/orion/internal/server/user/securestorage/SecureStorageUserAdmin.java @@ -10,6 +10,12 @@ *******************************************************************************/ package org.eclipse.orion.internal.server.user.securestorage; +import org.eclipse.orion.server.useradmin.servlets.UserServlet; + +import org.eclipse.core.runtime.CoreException; + +import org.eclipse.orion.internal.server.servlets.workspace.authorization.AuthorizationService; + import java.io.IOException; import java.net.URL; import java.util.ArrayList; @@ -67,6 +73,12 @@ private void initStorage() { String adminDefaultPassword = System.getProperty(Activator.ORION_STORAGE_ADMIN_DEFAULT_PASSWORD, null); if (adminDefaultPassword != null && getUser(USER_LOGIN, ADMIN_LOGIN_VALUE) == null) { createUser(new User(ADMIN_LOGIN_VALUE, ADMIN_NAME_VALUE, adminDefaultPassword)); + try { + AuthorizationService.addUserRight(ADMIN_LOGIN_VALUE, UserServlet.USERS_URI); + AuthorizationService.addUserRight(ADMIN_LOGIN_VALUE, UserServlet.USERS_URI +"/*"); //$NON-NLS-1$ + } catch (CoreException e) { + LogHelper.log(e); + } } //add default roles for (String role : new String[] {"admin", "user", "quest"}) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ From 2cacdb972d8548064e82c33817792cda88c213cf Mon Sep 17 00:00:00 2001 From: John Arthorne Date: Fri, 28 Jan 2011 14:40:03 -0500 Subject: [PATCH 2/2] tagged for build --- releng/org.eclipse.orion.releng/maps/orion.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.orion.releng/maps/orion.map b/releng/org.eclipse.orion.releng/maps/orion.map index 729088e..7c21c77 100644 --- a/releng/org.eclipse.orion.releng/maps/orion.map +++ b/releng/org.eclipse.orion.releng/maps/orion.map @@ -16,7 +16,7 @@ plugin@org.eclipse.orion.server.authentication.openid=GIT,tag=v20110127-1820,rep plugin@org.eclipse.orion.server.authentication.openid.core=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.authentication.openid.core plugin@org.eclipse.orion.server.authentication.basic=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.authentication.basic plugin@org.eclipse.orion.server.filesystem.git=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.filesystem.git -plugin@org.eclipse.orion.server.user.securestorage=GIT,tag=v20110128-1210,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.user.securestorage +plugin@org.eclipse.orion.server.user.securestorage=GIT,tag=v20110128-1437,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.user.securestorage plugin@org.eclipse.orion.server.useradmin=GIT,tag=v20110127-1820,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=/bundles/org.eclipse.orion.server.useradmin plugin@org.eclipse.orion.server.useradmin.xml=GIT,tag=v20110127-1820,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.useradmin.xml plugin@org.eclipse.orion.server.search=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.search