Allow username/password Redmine authentication

James Moger

2013-01-06 b8fab611aa1d9c12c447014014bec43a1fdc617f

Allow username/password Redmine authentication

 src/com/gitblit/RedmineUserService.java

@@ -86,30 +86,40 @@
            return super.authenticate(username, password);

        }



        String urlText = this.settings.getString(Keys.realm.redmine.url, "");

        if (!urlText.endsWith("/")) {

            urlText.concat("/");

        }

        String apiKey = String.valueOf(password);



        String jsonString = null;

        try {

            String jsonString = getCurrentUserAsJson(urlText, apiKey);



            RedmineCurrent current = new Gson().fromJson(jsonString, RedmineCurrent.class);

            String login = current.user.login;



            boolean canAdmin = true;

            if (StringUtils.isEmpty(login)) {

                login = current.user.mail;

                
                // non admin user can not get login name

                // TODO review this assumption, if it is true, it is undocumented

                canAdmin = false;

            // first attempt by username/password

            jsonString = getCurrentUserAsJson(username, password);

        } catch (Exception e1) {

            logger.warn("Failed to authenticate via username/password against Redmine");

            try {

                // second attempt is by apikey

                jsonString = getCurrentUserAsJson(null, password);

                username = null;

            } catch (Exception e2) {

                logger.error("Failed to authenticate via apikey against Redmine", e2);

                return null;

            }

            }

            

            UserModel user = getUserModel(login);

        RedmineCurrent current = null;

        try {

            current = new Gson().fromJson(jsonString, RedmineCurrent.class);

        } catch (Exception e) {

            logger.error("Failed to deserialize Redmine json response: " + jsonString, e);

            return null;

        }



        if (StringUtils.isEmpty(username)) {

            // if the username has been reset because of apikey authentication

            // then use the email address of the user. this is the original

            // behavior as contributed by github/mallowlabs

            username = current.user.mail;

        }



        UserModel user = getUserModel(username);

            if (user == null)    // create user object for new authenticated user

                user = new UserModel(login);

            user = new UserModel(username.toLowerCase());

            

            // create a user cookie

            if (StringUtils.isEmpty(user.cookie) && !ArrayUtils.isEmpty(password)) {

@@ -118,31 +128,44 @@
            

            // update user attributes from Redmine

            user.accountType = getAccountType();

            user.canAdmin = canAdmin;

            user.displayName = current.user.firstname + " " + current.user.lastname;

            user.emailAddress = current.user.mail;

            user.password = ExternalAccount;

        if (!StringUtils.isEmpty(current.user.login)) {

            // only admin users can get login name

            // evidently this is an undocumented behavior of Redmine

            user.canAdmin = true;

        }

            

            // TODO Redmine group mapping for administration & teams

        // TODO consider Redmine group mapping for team membership

            // http://www.redmine.org/projects/redmine/wiki/Rest_Users

            

            // push the changes to the backing user service

            super.updateUserModel(user);

            

            return user;

        } catch (IOException e) {

            logger.error("authenticate", e);

        }

        return null;

    }



    private String getCurrentUserAsJson(String url, String apiKey) throws IOException {

    private String getCurrentUserAsJson(String username, char [] password) throws IOException {

        if (testingJson != null) { // for testing

            return testingJson;

        }



        String url = this.settings.getString(Keys.realm.redmine.url, "");

        if (!url.endsWith("/")) {

            url.concat("/");

        }

        HttpURLConnection http;

        if (username == null) {

            // apikey authentication

            String apiKey = String.valueOf(password);

        String apiUrl = url + "users/current.json?key=" + apiKey;

        HttpURLConnection http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, null, null);

            http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, null, null);

        } else {

            // username/password BASIC authentication

            String apiUrl = url + "users/current.json";

            http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, username, password);

        }

        http.setRequestMethod("GET");

        http.connect();

        InputStreamReader reader = new InputStreamReader(http.getInputStream());


 tests/com/gitblit/tests/RedmineUserServiceTest.java

@@ -30,8 +30,8 @@
        RedmineUserService redmineUserService = new RedmineUserService();

        redmineUserService.setup(new MemorySettings(new HashMap<String, Object>()));

        redmineUserService.setTestingCurrentUserAsJson(JSON);

        UserModel userModel = redmineUserService.authenticate("RedmineUserId", "RedmineAPIKey".toCharArray());

        assertThat(userModel.getName(), is("redmineuserid"));

        UserModel userModel = redmineUserService.authenticate("RedmineAdminId", "RedmineAPIKey".toCharArray());

        assertThat(userModel.getName(), is("redmineadminid"));

        assertThat(userModel.getDisplayName(), is("baz foo"));

        assertThat(userModel.emailAddress, is("baz@example.com"));

        assertNotNull(userModel.cookie);

@@ -44,7 +44,7 @@
        redmineUserService.setup(new MemorySettings(new HashMap<String, Object>()));

        redmineUserService.setTestingCurrentUserAsJson(NOT_ADMIN_JSON);

        UserModel userModel = redmineUserService.authenticate("RedmineUserId", "RedmineAPIKey".toCharArray());

        assertThat(userModel.getName(), is("baz@example.com"));

        assertThat(userModel.getName(), is("redmineuserid"));

        assertThat(userModel.getDisplayName(), is("baz foo"));

        assertThat(userModel.emailAddress, is("baz@example.com"));

        assertNotNull(userModel.cookie);