Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 0a4d6112c -> a488bc7c2
KARAF-4293 - Set content-type header in Syncope login module Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a488bc7c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a488bc7c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a488bc7c Branch: refs/heads/karaf-3.0.x Commit: a488bc7c205876b78a20007157c462b2694d4e87 Parents: 0a4d611 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Feb 1 08:30:54 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Feb 1 10:08:56 2016 +0100 ---------------------------------------------------------------------- .../apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java | 4 ++++ .../apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a488bc7c/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java index d1734c7..55fe9bf 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeBackingEngine.java @@ -59,6 +59,7 @@ public class SyncopeBackingEngine implements BackingEngine { throw new IllegalArgumentException("Group prefix " + GROUP_PREFIX + " not permitted with Syncope backend"); } HttpPost request = new HttpPost(address + "/users"); + request.setHeader("Content-Type", "application/xml"); String userTO = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" + "<user>" + "<attributes>" + @@ -84,6 +85,7 @@ public class SyncopeBackingEngine implements BackingEngine { throw new IllegalArgumentException("Group prefix " + GROUP_PREFIX + " not permitted with Syncope backend"); } HttpDelete request = new HttpDelete(address + "/users/" + username); + request.setHeader("Content-Type", "application/xml"); try { client.execute(request); } catch (Exception e) { @@ -95,6 +97,7 @@ public class SyncopeBackingEngine implements BackingEngine { public List<UserPrincipal> listUsers() { List<UserPrincipal> users = new ArrayList<UserPrincipal>(); HttpGet request = new HttpGet(address + "/users"); + request.setHeader("Content-Type", "application/xml"); try { HttpResponse response = client.execute(request); String responseTO = EntityUtils.toString(response.getEntity()); @@ -122,6 +125,7 @@ public class SyncopeBackingEngine implements BackingEngine { public List<RolePrincipal> listRoles(Principal principal) { List<RolePrincipal> roles = new ArrayList<RolePrincipal>(); HttpGet request = new HttpGet(address + "/users?username=" + principal.getName()); + request.setHeader("Content-Type", "application/xml"); try { HttpResponse response = client.execute(request); String responseTO = EntityUtils.toString(response.getEntity()); http://git-wip-us.apache.org/repos/asf/karaf/blob/a488bc7c/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java index 47cbd0f..70c6cdb 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/syncope/SyncopeLoginModule.java @@ -81,6 +81,7 @@ public class SyncopeLoginModule extends AbstractKarafLoginModule { Credentials creds = new UsernamePasswordCredentials(user, password); client.getCredentialsProvider().setCredentials(AuthScope.ANY, creds); HttpGet get = new HttpGet(address + "/users/self"); + get.setHeader("Content-Type", "application/xml"); List<String> roles = new ArrayList<String>(); try { CloseableHttpResponse response = client.execute(get);
