githubFork/gitblit.git - Solinfo Gitblit

			@@ -69,6 +69,7 @@
			import com.gitblit.models.ServerSettings;
			import com.gitblit.models.ServerStatus;
			import com.gitblit.models.SettingModel;
			import com.gitblit.models.TeamModel;
			import com.gitblit.models.UserModel;
			import com.gitblit.utils.ByteFormat;
			import com.gitblit.utils.FederationUtils;
			@@ -508,6 +509,83 @@
			if (!userService.updateUserModel(username, user)) {
			throw new GitBlitException(isCreate ? "Failed to add user!" : "Failed to update user!");
			}
			}

			/**
			* Returns the list of available teams that a user or repository may be
			* assigned to.
			*
			* @return the list of teams
			*/
			public List<String> getAllTeamnames() {
			List<String> teams = new ArrayList<String>(userService.getAllTeamNames());
			Collections.sort(teams);
			return teams;
			}

			/**
			* Returns the TeamModel object for the specified name.
			*
			* @param teamname
			* @return a TeamModel object or null
			*/
			public TeamModel getTeamModel(String teamname) {
			return userService.getTeamModel(teamname);
			}

			/**
			* Returns the list of all teams who are allowed to bypass the access
			* restriction placed on the specified repository.
			*
			* @see IUserService.getTeamnamesForRepositoryRole(String)
			* @param repository
			* @return list of all teamnames that can bypass the access restriction
			*/
			public List<String> getRepositoryTeams(RepositoryModel repository) {
			return userService.getTeamnamesForRepositoryRole(repository.name);
			}

			/**
			* Sets the list of all uses who are allowed to bypass the access
			* restriction placed on the specified repository.
			*
			* @see IUserService.setTeamnamesForRepositoryRole(String, List<String>)
			* @param repository
			* @param teamnames
			* @return true if successful
			*/
			public boolean setRepositoryTeams(RepositoryModel repository, List<String> repositoryTeams) {
			return userService.setTeamnamesForRepositoryRole(repository.name, repositoryTeams);
			}
			/**
			* Updates the TeamModel object for the specified name.
			*
			* @param teamname
			* @param team
			* @param isCreate
			*/
			public void updateTeamModel(String teamname, TeamModel team, boolean isCreate) throws GitBlitException {
			if (!teamname.equalsIgnoreCase(team.name)) {
			if (userService.getTeamModel(team.name) != null) {
			throw new GitBlitException(MessageFormat.format(
			"Failed to rename ''{0}'' because ''{1}'' already exists.", teamname,
			team.name));
			}
			}
			if (!userService.updateTeamModel(teamname, team)) {
			throw new GitBlitException(isCreate ? "Failed to add team!" : "Failed to update team!");
			}
			}

			/**
			* Delete the team object with the specified teamname
			*
			* @see IUserService.deleteTeam(String)
			* @param teamname
			* @return true if successful
			*/
			public boolean deleteTeam(String teamname) {
			return userService.deleteTeam(teamname);
			}

			/**
			@@ -1115,6 +1193,7 @@
			case PULL_REPOSITORIES:
			return token.equals(all) \|\| token.equals(unr) \|\| token.equals(jur);
			case PULL_USERS:
			case PULL_TEAMS:
			return token.equals(all) \|\| token.equals(unr);
			case PULL_SETTINGS:
			return token.equals(all);
			@@ -1435,6 +1514,7 @@
			*
			* @param settings
			*/
			@SuppressWarnings("deprecation")
			public void configureContext(IStoredSettings settings, boolean startFederation) {
			logger.info("Reading configuration from " + settings.toString());
			this.settings = settings;
			@@ -1453,20 +1533,45 @@
			} catch (Throwable t) {
			// not a login service class or class could not be instantiated.
			// try to use default file login service
			File realmFile = getFileOrFolder(Keys.realm.userService, "users.properties");
			File realmFile = getFileOrFolder(Keys.realm.userService, "users.conf");
			if (realmFile.exists()) {
			// load the existing realm file
			loginService = new FileUserService(realmFile);
			} else {
			// create a new realm file and add the default admin account.
			// this is necessary for bootstrapping a dynamic environment
			// like running on a cloud service.
			try {
			realmFile.createNewFile();
			if (realmFile.getName().toLowerCase().endsWith(".properties")) {
			// load the v0.5.0 - v0.7.0 properties-based realm file
			loginService = new FileUserService(realmFile);

			// automatically create a users.conf realm file from the
			// original users.properties file
			File usersConfig = new File(realmFile.getParentFile(), "users.conf");
			if (!usersConfig.exists()) {
			logger.info(MessageFormat.format("Automatically creating {0} based on {1}",
			usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));
			ConfigUserService configService = new ConfigUserService(usersConfig);
			for (String username : loginService.getAllUsernames()) {
			UserModel userModel = loginService.getUserModel(username);
			configService.updateUserModel(userModel);
			}
			}

			// issue suggestion about switching to users.conf
			logger.warn("Please consider using \"users.conf\" instead of the deprecated \"users.properties\" file");
			} else if (realmFile.getName().toLowerCase().endsWith(".conf")) {
			// load the config-based realm file
			loginService = new ConfigUserService(realmFile);
			}
			} else {
			// Create a new realm file and add the default admin
			// account. This is necessary for bootstrapping a dynamic
			// environment like running on a cloud service.
			// As of v0.8.0 the default realm file is ConfigUserService.
			try {
			realmFile = getFileOrFolder(Keys.realm.userService, "users.conf");
			realmFile.createNewFile();
			loginService = new ConfigUserService(realmFile);
			UserModel admin = new UserModel("admin");
			admin.password = "admin";
			admin.canAdmin = true;
			admin.excludeFromFederation = true;
			loginService.updateUserModel(admin);
			} catch (IOException x) {
			logger.error(