James Moger
2014-09-04 913daf602ec0535d272140a2a5f96dffbd49b97e
Merged #143 "Fix url-based password keaing in Redmine auth provider"
1 files modified
5 ■■■■■ changed files
src/main/java/com/gitblit/auth/RedmineAuthProvider.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/auth/RedmineAuthProvider.java
@@ -153,15 +153,16 @@
        if (!url.endsWith("/")) {
            url = url.concat("/");
        }
        String apiUrl = url + "users/current.json";
        HttpURLConnection http;
        if (username == null) {
            // apikey authentication
            String apiKey = String.valueOf(password);
            String apiUrl = url + "users/current.json?key=" + apiKey;
            http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, null, null);
            http.addRequestProperty("X-Redmine-API-Key", apiKey);
        } else {
            // username/password BASIC authentication
            String apiUrl = url + "users/current.json";
            http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, username, password);
        }
        http.setRequestMethod("GET");