8000 fixes by patriot1burke · Pull Request #609 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

fixes #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patriot1burke merged 3 commits into from
Aug 10, 2014
Merged

fixes #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae0a76
use SecureRandom for totp
patriot1burke Aug 10, 2014
9aa6b4c
optimize imports
patriot1burke Aug 10, 2014
48f7efc
@NoCache where appropriate
patriot1burke Aug 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.keycloak.email.EmailException;
import org.keycloak.email.EmailProvider;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RealmProvider;
import org.keycloak.models.UserModel;

import java.util.Set;
Expand Down
1 change: 0 additions & 1 deletion audit/mongo/src/main/java/org/keycloak/audit/mongo/MongoEventQuery.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import java.util.LinkedList;
import java.util.List;
import java.util.Set;

/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
Expand Down
1 change: 0 additions & 1 deletion ...s/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import javax.persistence.Persistence;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;

/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
Expand Down
2 changes: 0 additions & 2 deletions ...in/java/org/keycloak/representations/idm/UserFederationProviderFactoryRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.keycloak.representations.idm;

import java.util.List;
import java.util.Map;
import java.util.Set;

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/keycloak/util/StringPropertyReplacer.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
package org.keycloak.util;

import java.util.Properties;
import java.io.File;
import java.util.Properties;

/**
* A utility class for replacing properties in strings.
Expand Down
2 changes: 1 addition & 1 deletion distribution/modules/lib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project name="module-repository-lib" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<project name="module-repository-lib">

<property name="src.dir" value="src"/>
<property name="module.repo.src.dir" value="${src.dir}/main/resources/modules"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/demo-template/admin-access-app/src/main/webapp/admin/admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
<%@ page import="org.keycloak.example.AdminClient" %>
<%@ page import="org.keycloak.representations.AccessTokenResponse" %>
<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1" %>
<html>
Expand Down
1 change: 0 additions & 1 deletion examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Date;
import java.util.concurrent.TimeUnit;

/**
Expand Down
1 change: 0 additions & 1 deletion examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.apache.http.client.methods.HttpGet;
import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.HttpClientBuilder;
import org.keycloak.representations.IDToken;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.util.JsonSerialization;

Expand Down
2 changes: 1 addition & 1 deletion examples/demo-template/customer-app/src/main/webapp/admin/admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
<%@ page import="org.keycloak.example.AdminClient" %>
<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1" %>
<html>
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-template/customer-app/src/main/webapp/customers/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1" %>
<%@ page import="org.keycloak.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.representations.IDToken" %>
<%@ page import="org.keycloak.ServiceUrlConstants" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<html>
<head>
<title>Customer View Page</title>
Expand Down
5 changes: 1 addition & 4 deletions examples/demo-template/product-app/src/main/webapp/products/servlet-logout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.ServiceUrlConstants" %>
<html>
<head>
<title>Servlet Logout</title>
</head>
<body bgcolor="#F5F6CE">
Performs a servlet logout
<%
<%
request.logout();
%>
</body>
Expand Down
2 changes: 1 addition & 1 deletion examples/demo-template/product-app/src/main/webapp/products/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ page import="org.keycloak.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.ServiceUrlConstants" %>
<html>
<head>
<title>Product View Page</title>
Expand Down
13 changes: 6 additions & 7 deletions ...template/third-party-cdi/src/main/java/org/keycloak/example/oauth/AppContextListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package org.keycloak.example.oauth;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import org.jboss.logging.Logger;
import org.keycloak.servlet.ServletOAuthClient;
import org.keycloak.servlet.ServletOAuthClientBuilder;

import javax.inject.Inject;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;

import org.jboss.logging.Logger;
import org.keycloak.servlet.ServletOAuthClient;
import org.keycloak.servlet.ServletOAuthClientBuilder;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
Expand Down
4 changes: 2 additions & 2 deletions ...mplate/third-party-cdi/src/main/java/org/keycloak/example/oauth/CDIResourcesProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.keycloak.example.oauth;

import org.keycloak.servlet.ServletOAuthClient;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.keycloak.servlet.ServletOAuthClient;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
Expand Down
11 changes: 5 additions & 6 deletions ...template/third-party-cdi/src/main/java/org/keycloak/example/oauth/RefreshTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.keycloak.example.oauth;

import java.io.IOException;
import java.util.Map;
import org.keycloak.OAuth2Constants;
import org.keycloak.adapters.ServerRequest;
import org.keycloak.servlet.ServletOAuthClient;

import javax.inject.Inject;
import javax.servlet.Filter;
Expand All @@ -13,10 +14,8 @@
import javax.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.keycloak.OAuth2Constants;
import org.keycloak.adapters.ServerRequest;
import org.keycloak.servlet.ServletOAuthClient;
import java.io.IOException;
import java.util.Map;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
Expand Down
3 changes: 1 addition & 2 deletions ...ate/third-party-cdi/src/main/java/org/keycloak/example/oauth/ServletRequestQualifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package org.keycloak.example.oauth;

import javax.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import javax.inject.Qualifier;

/**
* This is needed to have same code working in AS7 and Wildfly. In Wildfly is HttpServletRequest injected automatically, in AS7 it's not
*
Expand Down
5 changes: 2 additions & 3 deletions ...ples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/UserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.keycloak.example.oauth;

import java.io.Serializable;
import java.util.List;

import javax.enterprise.context.SessionScoped;
import javax.inject.Named;
import java.io.Serializable;
import java.util.List;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/faces-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
-->
<!-- Marker file indicating JSF should be enabled -->
<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">

</faces-config>
5 changes: 3 additions & 2 deletions examples/demo-template/third-party-cdi/src/main/webapp/client.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
>
<body>
<h1>Third Party App That Pulls Data Using OAuth</h1>
<h:form>
Expand Down
2 changes: 0 additions & 2 deletions examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.security.KeyStore;

/**
* Init code to load up the truststore so we can make appropriate SSL connections
Expand Down
9 changes: 0 additions & 9 deletions ...ava/org/keycloak/examples/federation/properties/ClasspathPropertiesFederationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
package org.keycloak.examples.federation.properties;

import org.jboss.logging.Logger;
import org.keycloak.Config;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderFactory;
import org.keycloak.models.UserFederationProviderModel;

import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
Expand Down
9 changes: 0 additions & 9 deletions ...va/org/keycloak/examples/federation/properties/ClasspathPropertiesFederationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,10 @@

import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.UserModel;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;

/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
Expand Down
9 changes: 0 additions & 9 deletions ...in/java/org/keycloak/examples/federation/properties/FilePropertiesFederationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,12 @@

import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.UserModel;

import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;

/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
Expand Down
2 changes: 0 additions & 2 deletions ...der/src/main/java/org/keycloak/examples/federation/properties/WritableUserModelProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import org.keycloak.models.UserModel;
import org.keycloak.models.utils.UserModelDelegate;

import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;

/**
Expand Down
5 changes: 2 additions & 3 deletions export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProvider.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.keycloak.exportimport;

import java.io.IOException;

import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.provider.Provider;

import java.io.IOException;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
Expand Down
5 changes: 2 additions & 3 deletions export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProvider.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.keycloak.exportimport;

import java.io.IOException;

import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.provider.Provider;

import java.io.IOException;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
Expand Down
4 changes: 2 additions & 2 deletions ...mport/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportJob.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.keycloak.exportimport.util;

import java.io.IOException;

import org.keycloak.models.KeycloakSession;

import java.io.IOException;

/**
* Task to be executed inside transaction
*
Expand Down
5 changes: 2 additions & 3 deletions ...ort/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportUtils.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.keycloak.exportimport.util;

import java.io.IOException;

import org.jboss.logging.Logger;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakTransaction;
import org.keycloak.models.RealmModel;

import java.io.IOException;

/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
Expand Down
Loading
0