Commit graph

676 commits

Author SHA1 Message Date
Bill Burke
6727af2f35 required action import/export 2015-07-17 22:48:07 -04:00
Bill Burke
2e848da1a8 resolve conflicts 2015-07-17 09:45:53 -04:00
Stian Thorgersen
1642ac2394 KEYCLOAK-1385 Introduce end-of-line normalization 2015-07-17 13:46:51 +02:00
Bill Burke
e51d2137cf migrate RequiredCredentials 2015-07-16 22:03:12 -04:00
Bill Burke
d74d93a522 fix problems 2015-07-15 14:54:14 -04:00
Bill Burke
f4d4405c20 export/import flows 2015-07-15 14:17:23 -04:00
nick.grange
ae242f8480 KEYCLOAK-1486 fixed User link in Clients' Active Sessions page
Changed User link in Clients' Active Sessions page to use userId
instead of username to show User details instead of Resource not found.
Renamed UserSessionRepresentation’s user attribute to username as it
was ambiguous and only used in 1 place (i.e. client-sessions.html).
2015-07-04 22:38:34 +10:00
Stian Thorgersen
db20077c37 Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421
Conflicts:
	testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java
2015-07-02 14:15:54 +02:00
mposolda
09994d1730 KEYCLOAK-1487 Support for multiple values of one UserModel attribute. LDAP multivalued attribute support 2015-06-29 14:56:40 +02:00
Vlastimil Elias
d7379f29da KEYCLOAK-1421 Added timestamp of keycloak user creation into user models
and persistence
2015-06-22 10:32:37 +02:00
Marko Strukelj
52565375b3 KEYCLOAK-1476 NotSerializableException: org.keycloak.models.cache.entities.CachedClientRole
- Remove noop code (Enum serialization 101 - http://docs.oracle.com/javase/6/docs/platform/serialization/spec/serial-arch.html#6469)
2015-06-17 22:05:32 +02:00
Marko Strukelj
0b0b101184 KEYCLOAK-1476 NotSerializableException: org.keycloak.models.cache.entities.CachedClientRole
Conflicts:
	model/api/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java
2015-06-17 19:34:38 +02:00
Stian Thorgersen
38c1945ce4 Bump version 2015-06-12 14:35:34 +02:00
mposolda
7badd3d5e5 JSON migration 2015-06-08 19:23:32 +02:00
Bill Burke
91283878ac html encoding fix 2015-06-08 12:38:16 -04:00
Marek Posolda
826c60ae36 Merge pull request #1324 from velias/KEYCLOAK-1371
KEYCLOAK-1371 - Perform "Update Profile on First Login" only if some of mandatory user profile fields is missing from identity provider
2015-06-04 15:19:59 +02:00
Stian Thorgersen
1dd0b563b6 KEYCLOAK-1386 Direct Grant API always on 2015-06-03 16:24:15 +02:00
Vlastimil Elias
dcc19a39d7 KEYCLOAK-1371 - Perform "Update Profile on First Login" only if some of
mandatory user profile fields is missing from identity provider
2015-06-03 15:24:25 +02:00
Stian Thorgersen
3d3871b0e6 Merge pull request #1291 from AOEpeople/KEYCLOAK-1305
KEYCLOAK-1305 Add possibility to change username
2015-06-03 10:51:34 +01:00
Vlastimil Elias
b86d091ad1 KEYCLOAK-1372 - do not perform email verification if email is provided
by trusted Identity provider
2015-06-02 14:59:29 +02:00
Niko Köbler
492e6cd856 KEYCLOAK-1305 Add possibility to change username 2015-06-02 14:08:19 +02:00
mposolda
dfe232cf80 KEYCLOAK-886 User Federation Mappers - admin console 2015-05-26 17:48:52 +02:00
mposolda
7476ee51e4 KEYCLOAK-886 Model and representations for UserFederationMappers 2015-05-22 21:09:50 +02:00
Stian Thorgersen
4e0a32a37a Version bump 2015-05-22 09:04:30 +02:00
girirajsharma
ccd5deb85f [KEYCLOAK 392] Audit admin events 2015-05-13 16:47:30 +05:30
Stian Thorgersen
d00e0021b6 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master
Conflicts:
	connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
	services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java
2015-05-11 13:36:30 +02:00
Stian Thorgersen
ccbd4bace1 KEYCLOAK-1289 Support environment variables in keycloak.json 2015-05-11 10:17:25 +02:00
Bill Burke
e4204a56f5 username mapper 2015-05-08 20:41:31 -04:00
Stian Thorgersen
035529d7a2 Version bump 2015-05-05 11:45:21 +02:00
girirajsharma
70f53c6c06 [KEYCLOAK-392] - Admin audit events 2015-05-03 01:46:52 +05:30
Stian Thorgersen
39627f0661 KEYCLOAK-1248 Fix direct grants only switch 2015-04-30 13:44:46 +02:00
Bill Burke
666827b7cb remove resteasy ClientRequest 2015-04-29 20:46:14 -04:00
mposolda
316053018b KEYCLOAK-1070 Support for view and revoke consents in admin console 2015-04-28 07:56:45 +02:00
Bill Burke
104a9f9842 Merge remote-tracking branch 'upstream/master' 2015-04-23 16:31:09 -04:00
Bill Burke
d49e0eda9e broker token role 2015-04-23 15:26:07 -04:00
mposolda
c942a8ac4f KEYCLOAK-1070 ClientModel.setName/getName 2015-04-23 18:21:21 +02:00
Stian Thorgersen
870f29d797 Merge pull request #1172 from stianst/master
Dist work
2015-04-23 12:40:38 +02:00
Stian Thorgersen
e17105cc8e Updated distribution and cleaning of maven modules 2015-04-23 11:15:05 +02:00
mposolda
34e033e351 KEYCLOAK-1070 JSON representation and export/import for userConsent 2015-04-22 11:29:43 +02:00
Bill Burke
193aa23581 broker mapper tests 2015-04-20 18:04:30 -04:00
Bill Burke
8eb2f35423 Merge remote-tracking branch 'upstream/master' 2015-04-17 16:41:16 -04:00
Bill Burke
a7c563b0eb oidc broker role mapper 2015-04-17 16:41:04 -04:00
Stian Thorgersen
115e533a71 KEYCLOAK-1061 Add back to application link to error page
KEYCLOAK-1148 space in redirect uri gives error
2015-04-16 14:17:32 +02:00
Bill Burke
0addc4cf58 broker mapper mgmt 2015-04-15 11:10:53 -04:00
Stian Thorgersen
4fbbf39c51 KEYCLOAK-1187 Admin console and endpoints 2015-04-13 13:29:31 +02:00
Stian Thorgersen
9a047eda36 KEYCLOAK-1187 Updated representations 2015-04-13 10:13:32 +02:00
Stian Thorgersen
a18715a774 Deprecate OAuthClientRepresentation and ApplicationRepresentation and added ClientRepresentation 2015-04-10 13:33:29 +02:00
Stian Thorgersen
6fbc0975c0 KEYCLOAK-1187 First round: Combined ApplicationModel and OAuthClientModel into ClientModel. Removed OAuth Clients from Admin console and renamed Applications to Clients. 2015-04-09 12:27:30 +02:00
Bill Burke
326818ea45 bump pom versio 2015-04-02 09:36:43 -04:00
mposolda
6a34ad36f5 Fix clustering when auth-server-url-for-backend-requests is used 2015-04-02 13:02:24 +02:00
mposolda
41bf97ff40 Fix Cors example 2015-04-01 16:28:09 +02:00
mposolda
a5567ead7a KEYCLOAK-1169 Skip DB write at each broker login if 3rd party token is not required 2015-04-01 11:00:02 +02:00
Bill Burke
2d7e861086 jwks parsing 2015-03-31 14:25:26 -04:00
girirajsharma
962b623b4a [KEYCLOAK-392] - Admin audit events 2015-03-30 14:06:01 +02:00
Stian Thorgersen
b727087f04 KEYCLOAK-1150
'iss' should be URL not just realm name
2015-03-26 13:50:36 +01:00
Bill Burke
d36ee0d0af Merge pull request #1088 from patriot1burke/master
oidc and saml broker backchannel logout
2015-03-26 08:43:21 -04:00
mposolda
477d8b35e3 KEYCLOAK-1116 KEYCLOAK-1117 JSON migration and removal of ClientModel.claimsMask 2015-03-26 11:49:22 +01:00
Bill Burke
13268c52c6 saml backchannel logout 2015-03-25 16:51:25 -04:00
Bill Burke
410953fc5f broker oidc logout 2015-03-23 13:21:17 -04:00
Bill Burke
97d5f4aafc broker refactor 2015-03-20 18:56:25 -04:00
Stian Thorgersen
0c16bdb31d KEYCLOAK-1080 Unrecognized field social when importing from 1.1.0.Final 2015-03-19 14:27:24 +01:00
Bill Burke
b26277a17c broker fixes 2015-03-18 21:58:04 -04:00
mposolda
4da566ae4d KEYCLOAK-1094 Rename k_idp_hint to kc_idp_hint 2015-03-16 20:00:20 +01:00
Stian Thorgersen
e2b02d414f Change adapters to use auth and token endpoints 2015-03-16 09:23:12 +01:00
Michael Gerber
144ee2c56d add localization support to realm
(cherry picked from commit b00764b)

add localization support to realm
(cherry picked from commit b00764b)

add localization support to realm
(cherry picked from commit b00764b)

admin gui for localization support
(cherry picked from commit c157cc3)

added locale support to ClassLoaderTheme and FolderTheme
(cherry picked from commit 764960a)

rename localizatin to internationalization
(cherry picked from commit 74a0658)

fallback if no message can be found
(cherry picked from commit 2d54e6f)

fallback if no message can be found
(cherry picked from commit 2d54e6f)

add HttpHeaders
(cherry picked from commit be921c8)

add HttpHeaders
(cherry picked from commit be921c8)

NPE fix
(cherry picked from commit 148158b)

improve locale helper
(cherry picked from commit 57a805a)

write cookie
fix npe
(cherry picked from commit 33398b3)

dropdown to choose language
(cherry picked from commit 9e2eb60)

added dropdown to choose locale to the account page.
fixed the path of the cookie.
(cherry picked from commit 871469a)

remove debug info
(cherry picked from commit c3ea6b1)

added dropdown to change locale for user.
(cherry picked from commit 1575bea)

add i18n for emails
(cherry picked from commit b6280e9)

i18n for emails
(cherry picked from commit 6118c51)

set default locale to english
(cherry picked from commit 386447b)

change locale type form String to Locale
(cherry picked from commit 8dcc595)

change file encoding
(cherry picked from commit 2cce96d)

added parameters to setSuccess, setWarning, setError
(cherry picked from commit 64ea438)

i18n for error messages
(cherry picked from commit e75d5ef)

i18n for error message in login
(cherry picked from commit 8b60c96)

add i18n for messages in account pages
(cherry picked from commit 9849d94)

fix unit test
(cherry picked from commit a70a1c7)

fix unit test
(cherry picked from commit 008744b)

locale localization :)
(cherry picked from commit f3a2144)

locale localization :)
(cherry picked from commit 21f6384)

messages refactoring
(cherry picked from commit 08f1ae7)

messages refactoring
(cherry picked from commit 3b4b53a)

messages refactoring
(cherry picked from commit 69146d4)

messages refactoring
(cherry picked from commit cd3db1d)

messages refactoring
(cherry picked from commit 715583f)

fix unit tests after message refactoring
(cherry picked from commit a82c9ff)

fix unit tests after message refactoring
(cherry picked from commit 5662d83)

fix unit tests after message refactoring
(cherry picked from commit 1188de6)

fix unit tests after message refactoring
(cherry picked from commit 90ded07)

German translations
(cherry picked from commit 9822b99)

removed newliines
(cherry picked from commit 34ca1d8)

removed java 8 dependency
(cherry picked from commit 3a23f4f)

typo
(cherry picked from commit a818122)

typo
(cherry picked from commit a818122)

forgotten properties

unit test fixes

unit test fixes

fixes after rebase

add localization support to realm
(cherry picked from commit b00764b)

add localization support to realm
(cherry picked from commit b00764b)

add localization support to realm
(cherry picked from commit b00764b)

admin gui for localization support
(cherry picked from commit c157cc3)

added locale support to ClassLoaderTheme and FolderTheme
(cherry picked from commit 764960a)

rename localizatin to internationalization
(cherry picked from commit 74a0658)

fallback if no message can be found
(cherry picked from commit 2d54e6f)

fallback if no message can be found
(cherry picked from commit 2d54e6f)

add HttpHeaders
(cherry picked from commit be921c8)

add HttpHeaders
(cherry picked from commit be921c8)

NPE fix
(cherry picked from commit 148158b)

improve locale helper
(cherry picked from commit 57a805a)

write cookie
fix npe
(cherry picked from commit 33398b3)

dropdown to choose language
(cherry picked from commit 9e2eb60)

added dropdown to choose locale to the account page.
fixed the path of the cookie.
(cherry picked from commit 871469a)

remove debug info
(cherry picked from commit c3ea6b1)

added dropdown to change locale for user.
(cherry picked from commit 1575bea)

add i18n for emails
(cherry picked from commit b6280e9)

i18n for emails
(cherry picked from commit 6118c51)

set default locale to english
(cherry picked from commit 386447b)

change locale type form String to Locale
(cherry picked from commit 8dcc595)

change file encoding
(cherry picked from commit 2cce96d)

added parameters to setSuccess, setWarning, setError
(cherry picked from commit 64ea438)

i18n for error messages
(cherry picked from commit e75d5ef)

i18n for error message in login
(cherry picked from commit 8b60c96)

add i18n for messages in account pages
(cherry picked from commit 9849d94)

fix unit test
(cherry picked from commit a70a1c7)

fix unit test
(cherry picked from commit 008744b)

locale localization :)
(cherry picked from commit f3a2144)

locale localization :)
(cherry picked from commit 21f6384)

messages refactoring
(cherry picked from commit 08f1ae7)

messages refactoring
(cherry picked from commit 3b4b53a)

messages refactoring
(cherry picked from commit 69146d4)

messages refactoring
(cherry picked from commit cd3db1d)

messages refactoring
(cherry picked from commit 715583f)

fix unit tests after message refactoring
(cherry picked from commit a82c9ff)

fix unit tests after message refactoring
(cherry picked from commit 5662d83)

fix unit tests after message refactoring
(cherry picked from commit 1188de6)

fix unit tests after message refactoring
(cherry picked from commit 90ded07)

German translations
(cherry picked from commit 9822b99)

removed newliines
(cherry picked from commit 34ca1d8)

removed java 8 dependency
(cherry picked from commit 3a23f4f)

typo
(cherry picked from commit a818122)

typo
(cherry picked from commit a818122)

forgotten properties

unit test fixes

unit test fixes

fixes after rebase

fixes after rebase

fixes after rebase

fixes after rebase
2015-03-14 14:08:06 +01:00
Vlastimil Elias
dec8d33af1 code formatting improved to keep only real changes done for
KEYCLOAK-1074
2015-03-12 15:43:16 +01:00
Vlastimil Elias
c8c0449124 code formatting patched to be close to original and produce better difs 2015-03-12 15:39:31 +01:00
Vlastimil Elias
21b4f9a2f1 KEYCLOAK-1074 - Allow registration with email as username (without
username as separate field)
2015-03-12 15:31:19 +01:00
Stian Thorgersen
ffbb2df1f3 KEYCLOAK-571 OpenID Connect Discovery
KEYCLOAK-1091 JSON Web Key Set endpoint
KEYCLOAK-790 One OpenID Connect token endpoint URL
2015-03-12 11:45:13 +01:00
Bill Burke
1de285b724 mappers 2015-03-06 18:42:20 -05:00
Bill Burke
4a4158a4e4 test saml attributes 2015-03-06 18:29:36 -05:00
mposolda
db07d79009 KEYCLOAK-1066 Kerberos credential delegation support 2015-03-06 12:59:29 +01:00
Bill Burke
db2c01caa9 more mappers 2015-03-05 19:55:53 -05:00
Bill Burke
6cfbd59d80 fix reg formatting 2015-03-04 20:59:40 -05:00
Bill Burke
98831ec05a fix other claims in IDToken 2015-03-04 20:27:06 -05:00
Stian Thorgersen
f907a749aa KEYCLOAK-1015 Allow configuring login timeout separate to login actions 2015-03-04 08:45:01 +01:00
Bill Burke
396e0c6171 refactor mappers 2015-03-03 20:38:28 -05:00
Bill Burke
753feae49e fixes 2015-03-02 21:39:43 -05:00
Bill Burke
07b038e126 add mapper category and help text 2015-02-27 18:21:42 -05:00
Bill Burke
8533d49dfb Merge remote-tracking branch 'upstream/master' 2015-02-27 17:28:09 -05:00
Bill Burke
1c6e90c4ef protocol mapper ui 2015-02-27 17:21:02 -05:00
pedroigor
b45d6b896a [KEYCLOAK-883] - Configuration option to disable token retrieval from applications. 2015-02-27 02:13:27 -03:00
Bill Burke
430daf4c39 Merge remote-tracking branch 'upstream/master' 2015-02-25 11:35:04 -05:00
Bill Burke
9f759ed77c rest interface for claim mapping 2015-02-25 11:34:51 -05:00
Stian Thorgersen
5a10bbc8ca KEYCLOAK-1017 Add server version to cached resources to prevent problems with browser cache 2015-02-25 15:03:01 +01:00
Stian Thorgersen
b6a512b494 KEYCLOAK-934 Extract dependencies into modules 2015-02-25 12:05:48 +01:00
Bill Burke
c20ad93807 claim mappings next phase 2015-02-24 19:37:07 -05:00
Bill Burke
69582ee3be more claims work 2015-02-21 10:26:55 -05:00
Bill Burke
42ffe21f91 Merge remote-tracking branch 'upstream/master' 2015-02-20 09:23:18 -05:00
Bill Burke
20f12ea960 changes 2015-02-20 09:22:49 -05:00
mposolda
d8024b0c6c Kerberos refactored to be federation provider. Support for Kerberos and LDAP. Username/password authentication support with kerberos credentials.
First step - KerberosFederationProvider

Finished KerberosFederationProvider. Added support for username/password authentication with kerberos credentials

Added Kerberos UI to LDAPFederationProvider

Fixes
2015-02-18 17:19:15 +01:00
Bill Burke
ebd9bae1ee client to protocol mapping model 2015-02-15 17:01:34 -05:00
Bill Burke
2fb97f058b claim support phase 2 2015-02-14 09:56:19 -05:00
Bill Burke
8586a8d1a5 Merge remote-tracking branch 'upstream/master' 2015-02-13 20:57:51 -05:00
Bill Burke
c09b17c2e2 claim mapping phase 1 2015-02-13 20:57:38 -05:00
mposolda
3ef243dd42 Add authenticateByDefault flag to IdentityProviderModel 2015-02-13 10:08:51 +01:00
girirajsharma
c3d7ef8066 Updated BC provider versions and deprecated CertificateUtil methods. 2015-02-10 18:44:54 +05:30
pedroigor
ff1f10d7a7 [KEYCLOAK-883] - Refactoring to services endpoints and exposing them through admin client. 2015-02-09 21:30:21 -02:00
pedroigor
4b1ba704ec [KEYCLOAK-992] - Token retrieval from brokered idps. 2015-02-06 22:23:34 -02:00
pedroigor
99a457c5c1 [KEYCLOAK-996] - Allow application to select provider. 2015-01-30 14:02:53 -02:00
Bill Burke
fd20a25100 Merge remote-tracking branch 'upstream/master' 2015-01-28 17:09:59 -05:00
Bill Burke
ea3bba98aa saml frontchannel logout 2015-01-28 17:09:13 -05:00
Stian Thorgersen
67ba1de56f KEYCLOAK-999 Load providers from file-system 2015-01-28 09:15:07 +01:00
mposolda
ee4fbca868 Improve OOTB experience for ssh and jmx authentication in fuse 2015-01-23 20:57:40 +01:00
pedroigor
edecda8599 [KEYCLOAK-986] - Escape characters when doing SAML POST Binding. 2015-01-23 12:09:44 -02:00
Bill Burke
ef2698936b Merge pull request #919 from pedroigor/KEYCLOAK-884
[KEYCLOAK-884] - OpenID Connect UserInfo Endpoint.
2015-01-16 14:28:30 -05:00
pedroigor
4f432775ed [KEYCLOAK-884] - OpenID Connect UserInfo Endpoint. 2015-01-16 15:45:27 -02:00
mposolda
d928c26e27 KEYCLOAK-539 Fuse adapter. OSGI bundling. OSGI headers in keycloak adapter maven artifacts. Rename package in jetty-core 2015-01-15 19:02:45 +01:00
pedroigor
fa2533ed11 [KEYCLOAK-883] - Initial changes. 2015-01-13 00:58:19 -02:00
Stian Thorgersen
959933a227 Version bump 2015-01-12 10:35:50 +01:00
Michael Gerber
9c484b9938 add test 2015-01-09 14:03:36 +01:00
mposolda
e62858cefd KEYCLOAK-900 Fix resolving of current hostname 2015-01-08 11:09:11 +01:00
Stian Thorgersen
628437c146 KEYCLOAK-760 OAuth2 refresh token expiration date 2015-01-05 10:50:50 +01:00
Bill Burke
28a56289d9 Merge pull request #897 from patriot1burke/master
saved requests
2014-12-17 22:29:46 -05:00
Bill Burke
08be04b337 saved requests 2014-12-17 22:29:18 -05:00
Michael Gerber
9169a3df76 IE 11 does not store cookie because of wrong time zone
https://issues.jboss.org/browse/KEYCLOAK-875
2014-12-13 21:24:49 +01:00
Bill Burke
6c04e26376 bump 2014-12-05 21:09:38 -05:00
Bill Burke
c0059a875b bump version 2014-12-05 19:03:13 -05:00
objectiser
8e01f8ecf1 KEYCLOAK-861 Support basic authentication against user credentials managed by KeyCloak. 2014-12-01 11:43:19 +00:00
Bill Burke
d0856e024f proxy distro 2014-11-24 18:12:17 -05:00
Bill Burke
46983d68f3 move ServerCookie to core 2014-11-14 09:20:03 -05:00
Bill Burke
0636cd898f fix incorrect JWS implementation 2014-11-11 21:28:35 -05:00
mposolda
a94ab5883d KEYCLOAK-835 Move AdapterConstants to different package 2014-11-10 22:16:20 +01:00
mposolda
d1e819cef1 KEYCLOAK-836 Refactoring of JaxrsBearerTokenFilter to work with both resteasy and Apache CXF. Added test 2014-11-10 22:16:14 +01:00
Timon Veenstra
7c9e3f4555 KEYCLOAK-829 Adjustment to KetstoreUtil to support loading keystore from classpath 2014-11-06 21:43:49 +01:00
Stian Thorgersen
0f8c073354 Version bump 2014-11-04 09:01:06 +01:00
Bill Burke
9c7e297118 principal token attribute mapping 2014-10-31 16:40:07 -04:00
mposolda
44d4f6eb95 Remove redundant realm property from KeycloakSecurityContext 2014-10-31 13:17:35 +01:00
Stian Thorgersen
9b0d5acb50 KEYCLOAK-704 KEYCLOAK-768 Improvements to access code generation 2014-10-31 12:45:03 +01:00
Juraci Paixão Kröhling
8e764e642f KEYCLOAK-779
Adapter multi-tenancy support
2014-10-30 16:54:26 +01:00
Bill Burke
0183ac43bc aud should be client-id, issuer should be realm 2014-10-29 15:56:25 -04:00
Stian Thorgersen
05b6dc7af4 KEYCLOAK-797
login-status-iframe.html fails if domain contains hyphen
2014-10-29 14:02:38 +01:00
Stian Thorgersen
fcda005d88 KEYCLOAK-772 Event settings are not imported 2014-10-28 20:21:03 +01:00
mposolda
a538e25b9d KEYCLOAK-702 - Added AdapterTokenStore spi. Possibility to save account info to cookie as alternative to http session 2014-10-27 16:20:01 +01:00
mposolda
01c705b4d3 KEYCLOAK-759 Added adapter clustering to admin console 2014-10-21 12:32:53 +02:00
Stian Thorgersen
63b41e2548 KEYCLOAK-703 Check valid origin is passed to login-status-iframe 2014-10-21 09:57:56 +02:00
mposolda
7d8f265789 KEYCLOAK-759 dynamic registration of managementUrls in cluster 2014-10-17 21:51:46 +02:00
Bill Burke
7760887ac1 app cert support, bug fixes 2014-10-14 18:38:48 -04:00
Bill Burke
4d007c776a generate/store realm certificate 2014-10-11 10:49:04 -04:00
Bill Burke
0ace5cd746 merge conflicts 2014-10-09 18:26:14 -04:00
Bill Burke
94da99bf10 use app id in admin console urls 2014-10-09 18:22:02 -04:00
mposolda
9954d68a1f KEYCLOAK-748 cluster-aware logout for non-distributable apps 2014-10-09 21:33:07 +02:00
mposolda
7e7406ddb7 KEYCLOAK-743 Stateless session mgmt. Drop statistics for adapters. 2014-10-08 22:18:10 +02:00
mposolda
84e1ace539 KEYCLOAK-742 Added always-refresh-token option to adapters 2014-10-08 22:18:10 +02:00
Bill Burke
a1d1877751 ClientModel attributes and protocol 2014-10-08 10:54:13 -04:00
mposolda
59bf7e524f Change method signature 2014-10-05 20:07:54 +02:00
mposolda
50f148cd7c Use one option "auth-server-url-for-backend-requests" instead of 3 options 2014-10-02 19:16:04 +02:00
mposolda
72b5632cfe KEYCLOAK-731 Support for replacing configuration of Java adapters with system properties 2014-10-02 19:15:37 +02:00
Bill Burke
71216bf2c9 merge 2014-10-01 14:21:23 -04:00
mposolda
d7bcd41909 Ensure that KeycloakUndertowAccount and referenced classes can be serialized in session 2014-10-01 19:08:41 +02:00
Bill Burke
4b399fe05a login protocol abstraction 2014-10-01 10:01:42 -04:00
mposolda
80a9a8984a Cleanup. Support to use-hostname-for-local-requests added to Demo examples 2014-09-30 17:37:36 +02:00
mposolda
337b03fc62 KEYCLOAK-720 added support for oauth clients 2014-09-30 17:37:36 +02:00
Stian Thorgersen
99c73a9cc7 Clustering support 2014-09-30 09:40:20 +02:00
Stian Thorgersen
423dc1b8a7 Change version schema to match JBoss 2014-09-12 09:35:08 +02:00
Stian Thorgersen
5dea07793b Version bump 2014-09-11 09:27:58 +02:00
Stian Thorgersen
557de7690e Fix CRSF protection on Chrome, and add check if 'Referer' header 2014-09-10 10:32:56 +02:00
Bill Burke
3f539c6d5c version bump 2014-09-09 13:34:56 -04:00
mposolda
1f0dcbddbe KEYCLOAK-659 Export current version number during export 2014-09-02 17:06:58 +02:00
Stian Thorgersen
05a1fc1ded Version bump 2014-09-01 10:17:00 +02:00
Stian Thorgersen
b9d0f64f74 Added password token to use inplace of plain-text password for totp 2014-08-28 13:51:55 +02:00
Stian Thorgersen
3bfe3d256e Rename audit to events 2014-08-28 10:56:37 +02:00
Stian Thorgersen
55bd889a0f KEYCLOAK-531 Reduce info level logging 2014-08-27 11:17:24 +02:00
Bill Burke
7c8edb5d11 bump pom 2014-08-21 10:46:49 -04:00
Bill Burke
e5d5276135 race 2014-08-20 14:50:28 -04:00
Bill Burke
edf73af508 change password 2014-08-13 10:35:49 -04:00
Bill Burke
7c97e02715 X-Frame-Options, Content-Security-Policy 2014-08-11 17:45:01 -04:00
mposolda
d699404ce7 Support for periodic users sync 2014-08-10 23:23:50 +02:00
Bill Burke
9aa6b4cbfa optimize imports 2014-08-10 12:17:45 -04:00
Bill Burke
aff32f69bb version 2014-08-06 15:44:50 -04:00
Bill Burke
e04af84ac0 bump version 2014-08-06 09:00:23 -04:00
Bill Burke
905061e2b7 bump version 2014-08-05 20:52:50 -04:00
Bill Burke
731d75c756 app full scope by default 2014-08-04 16:04:10 -04:00
Bill Burke
6cf708f6e1 fed exampe 2014-08-02 22:18:17 -04:00
Bill Burke
101a72cd65 remove AuthenticationProvider/Link 2014-08-01 18:03:48 -04:00
Stian Thorgersen
c460630cf8 Allow private addresses to use http with ssl-required=external 2014-08-01 15:05:45 +01:00
Stian Thorgersen
6cbeeb1b1a KEYCLOAK-591 Require SSL for all external requests by default 2014-08-01 13:52:04 +01:00
Bill Burke
b72a7db6fe federation display name 2014-07-31 10:51:04 -04:00
Bill Burke
8ea0d19d2f federation refactor 2014-07-30 16:01:54 -04:00
Stian Thorgersen
02a59812e6 Added ClientSessionModel to UserSessionProvider 2014-07-29 16:10:41 +01:00
Stian Thorgersen
628c7dd92a KEYCLOAK-579 Use relative urls in examples 2014-07-28 10:41:21 +01:00
Bill Burke
b1cd37814a rename 2014-07-25 10:40:46 -04:00
Bill Burke
171e9b1ce9 Merge remote-tracking branch 'upstream/master' 2014-07-23 15:10:48 -04:00
Bill Burke
eec582e704 merge 2014-07-23 15:10:36 -04:00
Stian Thorgersen
d6f5bf6cde Moved rememberMe, usernameUsed fields from AccessCode to UserSessions. Change AccessCode to have a single action instead of a list of required actions, also used action for codes that needs user to grant permissions first. Finally removed expiration time on access code and use timestamp directly 2014-07-23 15:58:09 +01:00
Bill Burke
148d494905 federation iteration 2014-07-23 10:21:25 -04:00
Stian Thorgersen
b196d0dded Remove access token from access code, and create token when code is exchanged for token 2014-07-22 09:37:21 +01:00
Bill Burke
f275ecf6d5 cache settings 2014-07-18 11:30:10 -04:00
Stian Thorgersen
46c04561ff Removed long ids and replaced with composite ids 2014-07-17 11:16:15 +01:00
mposolda
24a492ffe0 Export/import refactoring to use same representation as admin endpoints 2014-07-15 05:35:24 +02:00
Bill Burke
0758d89a59 Merge pull request #502 from mposolda/master
Changes in representations - adding role mappings under user representat...
2014-07-07 18:41:42 -04:00
Bill Burke
a1beff7d3d admin rest api test 2014-07-07 18:37:30 -04:00
mposolda
ffc30b4c03 Changes in representations - adding role mappings under user representation 2014-07-07 22:48:53 +02:00
Stian Thorgersen
711b8ca747 Return null for selected provider if empty string 2014-06-27 09:39:21 +01:00
Stian Thorgersen
34a1923d18 Refactor to prepar for splitting model 2014-06-27 09:39:06 +01:00
Bill Burke
d21a19925b stateless access codes 2014-06-20 10:37:27 -04:00
Stian Thorgersen
df2305eb02 Bumped version to 1.0-beta-4-SNAPSHOT 2014-06-19 10:19:10 +01:00
mposolda
f9cb99a1ee KEYCLOAK-534 Fix MS-SQL 2014-06-17 19:41:19 +02:00
Bill Burke
c71fdc72c7 keycloak-518 2014-06-16 10:43:50 -04:00
Bill Burke
d5b34a0b41 bump version again 2014-06-02 13:12:04 -04:00
Bill Burke
0fcf80dd6e bump version 2014-06-02 12:21:58 -04:00
Stian Thorgersen
2025d314ec Bump version to 1.0.beta2-SNAPSHOT 2014-05-30 08:52:03 +01:00
Bill Burke
2ae3775841 bump version 2014-05-29 12:12:33 -04:00
Bill Burke
e880b77692 update docs 2014-05-28 09:31:33 -04:00
Bill Burke
e4232c73c6 admin rest api example 2014-05-23 18:20:55 -04:00
Bill Burke
29070cec77 add KeycloakSecurityContext to principal 2014-05-23 16:26:44 -04:00
Stian Thorgersen
b09e2f697e Email audit listener 2014-05-20 17:04:17 +01:00
Stian Thorgersen
cc97265c06 Add realm option to enable/disable Resource Owner Password Credentials Grant 2014-05-20 11:32:22 +01:00
Stian Thorgersen
8d1149dc07 Add email theme config for realm 2014-05-20 11:00:43 +01:00
Bill Burke
11c23a7945 require redirect 2014-05-19 14:44:36 -04:00
Bill Burke
dc7923c436 fix brute shutdown 2014-05-19 10:33:49 -04:00
Bill Burke
c2bf6c3822 Merge remote-tracking branch 'upstream/master' 2014-05-17 14:24:37 -04:00
Bill Burke
ab8de6ba25 client user-session association 2014-05-17 14:24:32 -04:00
Stian Thorgersen
855269f35d Added 'keycloak-server.json' for configuring the server
Added SPI interface to detect SPI's
Converted Model to SPI/Provider to be loaded through ProviderSessionFactory
2014-05-16 17:33:22 +01:00
Stian Thorgersen
a3ed02ea16 Merge pull request #391 from jeroenr/master
CORS improvements and clean up
2014-05-16 16:06:43 +01:00
Jeroen Rosenberg
cedf43c084 Refactored joining of allowed headers to be more efficient 2014-05-16 14:28:49 +02:00
Bill Burke
c51c7fe189 Merge pull request #389 from jeroenr/master
Improved exception handling. Don't swallow exception
2014-05-16 06:34:18 -04:00
Jeroen Rosenberg
bde9944449 Improved exception handling. Don't swallow exception 2014-05-16 09:35:19 +02:00
Bill Burke
27efd3c0a4 ssoSessionIdleTimeout refactor 2014-05-15 13:53:28 -04:00
Stian Thorgersen
f4f9b1e323 KEYCLOAK-431 View open sessions, and logout all sessions, through account management 2014-05-14 11:56:28 +01:00
Bill Burke
1e1991e285 per-realm admin 2014-05-12 10:12:31 -04:00
Stian Thorgersen
6f0b12174c KEYCLOAK-432 Added user sessions 2014-05-09 11:52:45 +01:00
Bruno Oliveira
4424c425a6 Redundant initialization 2014-05-07 08:15:31 -03:00
Bruno Oliveira
5f7b0aae06 Variables will be never used 2014-05-07 08:15:02 -03:00
Bruno Oliveira
f77e3b5532 Unused imports 2014-05-07 08:14:32 -03:00
Bruno Oliveira
334b981741 notBefore wasn't being assigned 2014-05-07 08:10:03 -03:00
Bruno Oliveira
957ff7d206 Make it final 2014-05-07 08:05:57 -03:00
Bruno Oliveira
5973ccd522 Scope can be private 2014-05-07 08:03:21 -03:00
Bruno Oliveira
1ea1f0af96 Removing redundant local variable 2014-05-07 07:49:45 -03:00
Bruno Oliveira
f5ac81db41 Return not necessary here 2014-05-07 07:48:42 -03:00
Bruno Oliveira
9e7f52ccda extends Object isn't necessary 2014-05-07 07:47:39 -03:00
Bill Burke
64f591769a remove /rest from RealmsResource 2014-05-06 20:21:49 -04:00
Bill Burke
6f3822e6ea relative adapter urls 2014-05-02 10:17:40 -04:00
Bill Burke
54abfb670c brute force settings 2014-04-15 11:37:27 -04:00
Bill Burke
2b8d2288fb more brute force detection 2014-04-14 18:58:45 -04:00
mposolda
5aefe52ccc Refactoring of Authentication SPI and Picketlink to use ProviderSessions
Refactoring of ProviderSessionFactory to support dependencies between components
Calling lifecycle methods
Removing KeycloakRegistry
2014-04-09 00:34:01 +02:00
Stian Thorgersen
8ca46fa35d Audit configurable through admin console 2014-04-07 17:58:52 +01:00
Stian Thorgersen
e6067c915d Added ProviderSession to requests 2014-04-03 16:27:31 +01:00
Bill Burke
231e8895a5 Merge pull request #309 from vibe13/master
Cleaning of pom.xml files
2014-04-02 11:39:04 -04:00
mposolda
25bf6d63b4 Refactoring of AuthenticationProvider SPI 2014-04-02 17:27:07 +02:00
Stian Thorgersen
722a077de7 Added JPA audit provider£ 2014-04-01 15:13:53 +01:00
Andrea Vibelli
84f1e1b56e Extraction into properties of maven-compiler-plugin source and target 2014-03-31 11:17:16 +02:00
Andrea Vibelli
3ddb2084cd Remove duplicated dead code 2014-03-31 10:44:47 +02:00
Andrea Vibelli
37fdc50fb4 Remove warnings about no schema definition in pom.xml files 2014-03-31 10:44:22 +02:00
mposolda
793f69d4b6 Authentication SPI. Implementations based on Picketlink+LDAP, model and external model (other realm). Added KeycloakRegistry 2014-03-24 23:11:11 +01:00
Stian Thorgersen
331ab71427 KEYCLOAK-380 Added OAuth2Constants 2014-03-15 10:43:52 +00:00
Stian Thorgersen
f9aaa16cfe KEYCLOAK-378 KEYCLOAK-379 KEYCLOAK-381 Fix refresh token if token contains app roles. Changed long time fields in AccessCode and AccessToken to int 2014-03-15 10:15:10 +00:00
Stian Thorgersen
2ebc32793a Started installed application adapter 2014-03-14 17:01:08 +00:00
Bill Burke
7763da1273 bump version to beta-1 snapshot 2014-03-13 11:24:38 -04:00
Bill Burke
1c6b867079 bump version 2014-03-13 10:58:22 -04:00
Stian Thorgersen
ee5cab04e0 Set next version 2014-03-13 09:10:42 +00:00
Bill Burke
3ff8d0fd1f bump version 2014-03-12 16:48:12 -04:00
Bill Burke
52018b1f81 revoke on logoutAll 2014-03-12 15:57:43 -04:00
Stian Thorgersen
6dc156712e KEYCLOAK-359 Add user friendly username for social links 2014-03-12 08:52:47 +00:00
Bill Burke
a653e5a406 refactor adapters 2014-03-06 21:13:55 -05:00
Bill Burke
dd292c1d52 remove scope support for now part 2 2014-03-06 10:26:46 -05:00
Bill Burke
599faa3cb5 public clients 2014-03-05 20:26:27 -05:00
Bill Burke
d6bd02ea7d session mgmt 2014-03-04 22:25:33 -05:00
Bill Burke
2d86b29b6c session stats 2014-03-04 15:52:27 -05:00
Bill Burke
716972347d revocation 2014-03-03 15:50:10 -05:00
Bill Burke
c8023c6651 revocation next phase: undertow complete 2014-03-02 17:32:25 -05:00
Bill Burke
7b30cc59b8 revocation phase 1 2014-02-28 19:47:05 -05:00
Bill Burke
11559cba50 public realm info update 2014-02-28 09:52:53 -05:00
Bill Burke
f8da693fd0 move secret to clientmodel 2014-02-27 10:59:47 -05:00
Bill Burke
42d30a5a70 rename scope rep username to client 2014-02-26 22:23:04 -05:00
Bill Burke
0f67feb9dd IDToken setup 2014-02-26 19:04:42 -05:00
Bill Burke
b249809d2e claims backend 2014-02-26 15:29:17 -05:00
Bill Burke
64065a4573 javascript refresh token 2014-02-24 19:58:54 -05:00
Bill Burke
4b78857b51 as7 adapter refresh token support 2014-02-24 17:16:45 -05:00
Bill Burke
01ddafa83a central login timeouts, rememberme framework 2014-02-22 21:52:29 -05:00
Bill Burke
3e88cb3b76 logout 2014-02-22 20:40:06 -05:00
Bill Burke
0a9b82a6f4 refresh tokens server side 2014-02-21 17:36:39 -05:00
Bill Burke
97dd7470ce rename tokenLifespan to accessTokenLifespan 2014-02-21 12:12:54 -05:00
Bill Burke
9607acdb6a refactor token creation 2014-02-21 12:02:24 -05:00
Bill Burke
9442601e42 rename some classes 2014-02-21 10:16:12 -05:00
Bill Burke
4b1fc788cf Merge remote-tracking branch 'upstream/master' 2014-02-21 09:49:08 -05:00
Bill Burke
94d8dbeeee issuedFor has OpenID claim now 2014-02-21 09:48:48 -05:00
Stian Thorgersen
9ce8e16063 KEYCLOAK-284 Subject in token is now user id instead of username 2014-02-21 09:48:43 +00:00
Bill Burke
6794166b58 tokens/access/codes now uses basic auth 2014-02-20 17:19:51 -05:00
Bill Burke
00043423c2 alpha 3 version bump 2014-02-19 23:22:34 -05:00
Bill Burke
27f61a9f86 bump version 2014-02-19 21:01:42 -05:00
Bill Burke
0cdd5e857e use secrets 2014-02-13 18:36:41 -05:00
Bill Burke
f04e7511a7 as7/eap subsystem 2014-02-10 18:58:23 -05:00
Bill Burke
cce8814254 composite switch 2014-02-05 10:28:11 -05:00
Bill Burke
d2ad6349ba remove setComposite 2014-02-04 18:41:36 -05:00
Bill Burke
7c190e40ee fix demo 2014-02-04 12:02:09 -05:00
Bill Burke
4e66a3bf81 Merge remote-tracking branch 'upstream/master' 2014-02-04 10:09:25 -05:00
Bill Burke
92091d9474 composite tests 2014-02-04 10:09:09 -05:00
Stian Thorgersen
97897cab1d KEYCLOAK-15 Customize login and registration forms 2014-02-04 11:45:24 +00:00
Bill Burke
8505cc612a composite representations 2014-02-03 17:21:56 -05:00
Bill Burke
e222240282 composite UI 2014-01-31 21:39:54 -05:00
Bill Burke
1cbe3596b4 Merge remote-tracking branch 'upstream/master' 2014-01-30 20:32:11 -05:00
Bill Burke
9ba6784424 Merge pull request #179 from matzew/Base64
clean up: using Base64 class as dependency
2014-01-30 07:50:11 -08:00
Bill Burke
bb5991239b composite roles 2014-01-29 20:19:32 -05:00
Matthias Wessendorf
2efcb95fd6 some minor util class clean-up, to prevent instanciation of util classes 2014-01-28 14:30:22 +01:00
Matthias Wessendorf
463a04f0a2 Using the net.iharder.Base64 dependency JAR instead of a copied class 2014-01-27 15:05:48 +01:00
Stian Thorgersen
4cb98a3aa4 Set version to 1.0-alpha-2-SNAPSHOT 2014-01-24 09:34:54 +00:00
Bill Burke
c77a6dfc40 dist 2014-01-22 19:18:00 -05:00
Stian Thorgersen
c5366f1c81 KEYCLOAK-264 Remove option to enable/disable acct mngmt 2014-01-17 09:30:56 +00:00
Stian Thorgersen
dcfb83b0f2 KEYCLOAK-64 KEYCLOAK-246 Updated social to use update profile required action instead of registration form. Fixed Google provider 2014-01-16 12:52:46 +00:00
Bill Burke
b162190c7f remove cookieLoginAllowed 2014-01-15 20:31:01 -05:00
Bill Burke
6326d5d2b5 auth-server-url and Realm/App name changes 2014-01-15 10:02:56 -05:00
Bill Burke
62cc002396 constants 2014-01-13 19:42:34 -05:00
mposolda
d309fab825 KEYCLOAK-231 Support for sending scope parameter from applications and oauth clients 2014-01-13 18:41:00 +01:00
Stian Thorgersen
0a57ba026b KEYCLOAK-180 Renamed JWT prn to sub 2014-01-10 10:22:58 +00:00
Bill Burke
30cb9df307 undertow logout 2013-12-19 18:32:47 -05:00
Bill Burke
834baf0e27 refactor admin actions 2013-12-19 15:22:15 -05:00
Bill Burke
40e8a26a3b threadlocal 2013-12-18 18:10:28 -05:00
Bill Burke
0ec80f6590 remove ThreadLocal SkeletonKeySession 2013-12-18 18:08:48 -05:00
Bill Burke
16f5bbc54e undertow/wildfly adapter fixes 2013-12-18 18:01:47 -05:00
Bill Burke
cbf46720c7 installation text 2013-12-17 18:16:17 -05:00
Bill Burke
6380dc3d1b refactor out resteasy from adapters 2013-12-17 12:07:02 -05:00
Bill Burke
d22b6f8df7 factor out jwt/jose/jws 2013-12-16 11:19:46 -05:00
Bill Burke
d28b1ff98b refactor core/adapter 2013-12-13 19:53:02 -05:00
Stian Thorgersen
0dad786b35 KEYCLOAK-220 Fix login to realm with space in id, KEYCLOAK-199 Add account management to admin realm 2013-12-07 11:35:32 +00:00
Bill Burke
d86dec6561 version bump to SNAPSHOT 2013-12-06 09:45:08 -05:00
Bill Burke
4909316d59 pom version bump 2013-12-06 08:40:35 -05:00
Stian Thorgersen
7f499b2833 KEYCLOAK-186 Password policies 2013-12-03 12:53:26 +00:00
Stian Thorgersen
85eeb415e1 KEYCLOAK-181
Link back to application from account management pages
2013-11-28 13:48:30 +00:00
Bill Burke
799df520b8 realm import changes 2013-11-27 17:02:12 -05:00
Bill Burke
3a9f9d73c2 Merge remote-tracking branch 'upstream/master' 2013-11-26 15:40:24 -05:00
Bill Burke
f79739f73e oauth client 2013-11-26 15:39:57 -05:00
Stian Thorgersen
c6f4e21b84 KEYCLOAK-153
Realm installation page
2013-11-26 17:28:00 +00:00
Stian Thorgersen
fad194fc8f Improved error handling in admin console. Delete roles through admin console. 2013-11-25 13:46:04 +00:00
vrockai
ab7cc63084 KEYCLOAK-156 add new user properties to admin ui 2013-11-20 10:50:05 +01:00
Bill Burke
934eca73f4 merged 2013-11-15 14:18:00 -05:00
Bill Burke
965bc6dccb wildfly adapter 2013-11-15 14:15:33 -05:00
Stian Thorgersen
45424e5eba Removed '*' role 2013-11-15 16:38:44 +00:00
Stian Thorgersen
158d1740b8 KEYCLOAK-72 and KEYCLOAK-158 2013-11-15 11:03:25 +00:00
Bill Burke
2861ea0e96 nasty merge 2013-11-05 23:12:07 -05:00
Bill Burke
d04ca2c34f jpa backend 2013-11-05 21:26:33 -05:00
Stian Thorgersen
d083909136 Added support for default application roles. Added authz to account, user (or client if oauth) is required to have role manage-account to manage their account, this is a default role for the Account application. 2013-11-04 17:21:46 +00:00
Bill Burke
d6ee6aef9f adapter cors support 2013-10-30 08:28:23 -04:00
Bill Burke
0f03670c06 Merge remote-tracking branch 'upstream/master' 2013-10-25 18:04:35 -04:00
Bill Burke
6e6dccd339 cors token modifications 2013-10-25 18:03:28 -04:00
Stian Thorgersen
45b5f5afd5 Add setting realm.accessCodeLifespanUserAction in admin console 2013-10-25 12:39:25 +01:00
Stian Thorgersen
36662fb5ca Added map for social provider settings to RealmRepresentation 2013-10-22 13:47:30 +01:00
Stian Thorgersen
f365e85118 Added map for smtp server settings to RealmRepresentation 2013-10-22 13:47:30 +01:00
Bill Burke
158f85cb7a Merge remote-tracking branch 'upstream/master' 2013-10-21 14:49:56 -04:00
Stian Thorgersen
d79d299073 Made account management an optional feature on a realm, and added login and logout to account management pages 2013-10-19 16:24:58 +01:00
Bill Burke
645cfa5beb Merge remote-tracking branch 'upstream/master' 2013-10-18 15:47:49 -04:00
Bill Burke
1d75b50acb cors 2013-10-18 15:47:33 -04:00
Stian Thorgersen
34fe0a751c Added cors support to TokenService.accessCodeToToken 2013-10-18 19:17:11 +01:00
Bill Burke
5851430983 Merge pull request #76 from patriot1burke/master
bootstrapping 2
2013-10-17 12:47:55 -07:00
Bill Burke
2a6b6ebef5 stuff 2013-10-17 13:53:46 -04:00
Stian Thorgersen
79c1230a9d Added redirect uris to application 2013-10-17 15:25:06 +01:00
Bill Burke
b58b2c760f scope mapping, oauth client 2013-10-09 17:27:45 -04:00
Bill Burke
7613df71c2 app password 2013-10-06 18:41:35 -04:00
Bill Burke
86a2617799 split up realm settings 2013-09-27 15:57:30 -04:00
Bill Burke
195b06616f Merge pull request #38 from patriot1burke/master
role mapping
2013-09-25 07:44:26 -07:00