libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions
3127 commits 4 branches 5 tags 483 MiB
Commit graph

462 commits

Author SHA1 Message Date
Stian Thorgersen
e7625c2bb1 KEYCLOAK-820 Don't expose realm private key through admin endpoints 2014-11-05 15:34:56 +01:00
Stian Thorgersen
91529ef6fd Fix MultiTenancyTest 2014-11-04 13:05:44 +01:00
mposolda
9ae8d6aee1 Fix LDAP test for case-insensitive databases like MySQL 2014-11-03 21:35:12 +01:00
mposolda
229391d48b Fix servlet logout on wildfly/undertow 2014-11-03 12:59:40 +01:00
Stian Thorgersen
488351e46f Merge pull request #828 from stianst/master 
KEYCLOAK-787 Clicking back to login after sending password reset email f...
 2014-10-31 14:05:31 +01:00
Stian Thorgersen
bb2de4dc59 KEYCLOAK-787 Clicking back to login after sending password reset email fails 2014-10-31 13:59:56 +01:00
Stian Thorgersen
8d1548bd4d Merge pull request #826 from stianst/master 
Fixes
 2014-10-31 12:45:31 +01:00
Stian Thorgersen
9b0d5acb50 KEYCLOAK-704 KEYCLOAK-768 Improvements to access code generation 2014-10-31 12:45:03 +01:00
mposolda
78a1df693c KEYCLOAK-808 Issue when DB search is case-sensitive byt LDAP search is not 2014-10-31 10:27:55 +01:00
Stian Thorgersen
8adad9dddf KEYCLOAK-806 
Increase defaults for 'SSO Session Idle Timeout'
 2014-10-31 09:41:21 +01:00
mposolda
a6ca925340 KEYCLOAK-788 Ensure expired ClientSessions removed during UserSessionProvider.removeExpiredUserSessions 2014-10-30 23:02:48 +01:00
Juraci Paixão Kröhling
8e764e642f KEYCLOAK-779 
Adapter multi-tenancy support
 2014-10-30 16:54:26 +01:00
Bill Burke
5e8ca5a140 Merge pull request #807 from patriot1burke/master 
add tomcat7 adapter test
 2014-10-28 18:41:57 -04:00
Bill Burke
da27f43573 add tomcat7 adapter test 2014-10-28 18:41:35 -04:00
Stian Thorgersen
6e4785e74c KEYCLOAK-777 No login event for social login 2014-10-28 19:56:41 +01:00
Stian Thorgersen
4eb60a169b KEYCLOAK-728 2014-10-28 19:48:11 +01:00
Bill Burke
cb110d095f conflict 2014-10-28 11:55:52 -04:00
Bill Burke
e3609cc85b app importer 2014-10-28 11:54:58 -04: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
Bill Burke
ce76270ad8 saml key refactor 2014-10-24 10:58:32 -04:00
Bill Burke
f38c6d3412 config optiosn 2014-10-22 14:00:56 -04:00
Bill Burke
d3375962ad signature algorithm support 2014-10-21 10:35:39 -04:00
Bill Burke
e0730e5517 Merge remote-tracking branch 'upstream/master' 2014-10-21 09:05:37 -04:00
Bill Burke
c1694a2791 more saml unit tests 2014-10-21 09:05:24 -04:00
Stian Thorgersen
2c218c9aa0 KEYCLOAK-711 HttpServletReqest.logout() does not work with relative URI 2014-10-21 12:36:20 +02:00
Stian Thorgersen
dd4b2f811b KEYCLOAK-710 Ignore missing roles in access-code 2014-10-21 11:15:35 +02:00
Bill Burke
e2de6edff8 saml unit tests 2014-10-20 16:31:00 -04:00
Bill Burke
d0ce72167d merge 2014-10-17 16:54:25 -04:00
Bill Burke
c91ecc3033 saml redirect binding 2014-10-17 16:48:45 -04:00
mposolda
7d8f265789 KEYCLOAK-759 dynamic registration of managementUrls in cluster 2014-10-17 21:51:46 +02:00
Stian Thorgersen
01507fc1dc KEYCLOAK-747 Fix onUserRemoved in user session providers 2014-10-17 13:35:07 +02:00
Bill Burke
3e5afcde9e saml encryption 2014-10-16 11:44:51 -04:00
Bill Burke
4750b22b6d saml signatures 2014-10-16 09:14:04 -04:00
Bill Burke
8fbc8fc736 Merge remote-tracking branch 'upstream/master' 2014-10-14 18:39:08 -04:00
Bill Burke
7760887ac1 app cert support, bug fixes 2014-10-14 18:38:48 -04:00
Stian Thorgersen
94de88ef3b KEYCLOAK-736 Database migration support" 2014-10-14 10:07:41 +02:00
Bill Burke
deffa9b4e1 oauth id in admin console 2014-10-10 16:55:57 -04:00
mposolda
2445575a04 Test for KEYCLOAK-741 2014-10-09 12:30:30 +02:00
mposolda
7e7406ddb7 KEYCLOAK-743 Stateless session mgmt. Drop statistics for adapters. 2014-10-08 22:18:10 +02:00
Bill Burke
13a2108846 undertow slash redirect problem 2014-10-08 09:45:49 -04:00
Bill Burke
5f1e6f3a23 merge 2014-10-07 18:17:44 -04:00
Bill Burke
6d5ab0f66b saml backchannel logout 2014-10-07 18:06:02 -04:00
mposolda
6522455b44 KEYCLOAK-738 Possible NPE in MemUserSessionProvider.getUserSessions 2014-10-07 19:19:46 +02:00
Bill Burke
e01424b815 Merge pull request #741 from patriot1burke/master 
saml basic
 2014-10-04 22:15:56 -04:00
Bill Burke
e3a3933390 saml basic 2014-10-04 21:27:48 -04:00
Stian Thorgersen
0d5be568f8 KEYCLOAK-722 Refreshing token throws RuntimeException if realm keys have changed 2014-10-03 13:23:21 +02:00
Stian Thorgersen
d6f030a05a KEYCLOAK-662 NPE when using direct grant API with email as username 2014-10-03 12:10:52 +02:00
Stian Thorgersen
a5aa1da841 Add login test with multiple sessions for same user 2014-10-03 10:41:04 +02:00
mposolda
e6121f301f KEYCLOAK-732 AuthenticationManager.logout should logout just current userSession 2014-10-02 22:52:44 +02:00
Bill Burke
cbc383d494 finish protocol refactoring 2014-10-01 14:19:59 -04:00
Bill Burke
4b399fe05a login protocol abstraction 2014-10-01 10:01:42 -04:00
Bill Burke
e32f73880f Merge remote-tracking branch 'upstream/master' 2014-09-30 15:58:39 -04:00
Bill Burke
63b65c933b token service refactoring 2014-09-30 15:58:20 -04:00
Stian Thorgersen
f026772c87 KEYCLOAK-725 Add realm update to the Admin Client 2014-09-30 15:43:18 +02:00
Stian Thorgersen
1d4e842cc0 Fixes to Mongo user session provider 2014-09-30 14:24:49 +02:00
Stian Thorgersen
209fdc1255 Fix UserSessionProviderTest.testGetByClientPaginated 2014-09-30 10:59:37 +02:00
Stian Thorgersen
bdeb59f87e Fixes to UserSessionProviderTest 2014-09-30 10:22:33 +02:00
Stian Thorgersen
99c73a9cc7 Clustering support 2014-09-30 09:40:20 +02:00
Bill Burke
fc867e59ea action url refactor 2014-09-29 16:57:58 -04:00
Bill Burke
75a3093dda login refactor phase 2, still more to do 2014-09-29 16:15:33 -04:00
Bill Burke
67f10bee24 Merge remote-tracking branch 'upstream/master' 2014-09-29 09:56:37 -04:00
Bill Burke
524b423733 ClientSession everywhere refactor phase1 2014-09-26 17:44:33 -04:00
Stian Thorgersen
f2e97ff9d6 Add test to add/remove attributes to user through admin endpoints 2014-09-25 19:35:57 +02:00
mposolda
5352872b4b Use KEYCLOAK_REMEMBER_ME as hint to prefill login form. Change lifespan of KEYCLOAK_IDENTITY to maxSsoSessionLifespan 2014-09-16 22:09:27 +02:00
mposolda
6f173d4554 KEYCLOAK-678 Preserve form values in account mgmt after error 2014-09-11 20:54:48 +02:00
mposolda
649a40f58c KEYCLOAK-676 Validate email address format during registration or account mgmt 2014-09-11 20:05:00 +02:00
Stian Thorgersen
280cbf2174 KEYCLOAK-680 Add/remove social-links through admin api 2014-09-11 12:09:55 +02:00
Stian Thorgersen
09860f1ee1 Fix test 2014-09-09 11:01:24 +02:00
Stian Thorgersen
d5c5cc8321 Fix AccountTest.viewLog test 2014-09-03 08:53:02 +02:00
mposolda
1f0dcbddbe KEYCLOAK-659 Export current version number during export 2014-09-02 17:06:58 +02:00
mposolda
44937d33ad Use stronger passwords in LDAP tests due to password policy on MSAD2012 2014-09-02 12:43:14 +02:00
Stian Thorgersen
0763d0d9d6 Merge pull request #660 from stianst/master 
KEYCLOAK-658 Fix searching for users
 2014-09-02 10:02:08 +02:00
Stian Thorgersen
8c8c44e50f KEYCLOAK-658 Fix searching for users 2014-09-02 10:01:44 +02:00
mposolda
e52811ac28 Added more props to LDAPEmbeddedServer to allow automated test with ActiveDirectory 2014-09-01 20:43:14 +02:00
Stian Thorgersen
31b0f5543f Fixes 2014-08-29 17:11:18 +02:00
Stian Thorgersen
32703d19a0 Fix test 2014-08-29 08:59:57 +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
mposolda
fb18004c1d KEYCLOAK-643 Handle flows with adding user with existing username or email in federation providers 2014-08-27 12:19:23 +02:00
mposolda
fc0889cd2e KEYCLOAK-644 Searching by email from LDAP doesn't work 2014-08-26 20:24:25 +02:00
mposolda
b3b480c25f Display proper error message if LDAP-linked user couldn't be deleted due to read-only mode 2014-08-26 19:10:48 +02:00
mposolda
fd9d2ba4d5 Handle exceptions and UI errors when user is read only. Some sync issues 2014-08-26 12:54:05 +02:00
mposolda
6c7d0f27a7 More tooltips for LDAP and generic federation. Minor fixes 2014-08-25 16:28:52 +02:00
Bill Burke
e99afec7ec import console from export 2014-08-21 17:17:09 -04:00
Bill Burke
e5d5276135 race 2014-08-20 14:50:28 -04:00
Bill Burke
74cd23b331 fix mongo 2014-08-19 14:49:15 -04:00
Bill Burke
faf18dfdfd fix cookie parsing problem 2014-08-18 18:36:36 -04:00
Bill Burke
2dc32fb8c9 fix menu error 2014-08-18 18:06:23 -04:00
Bill Burke
5dca2a3588 expanded token service coverage 2014-08-14 21:01:05 -04:00
Bill Burke
cfee00d4c5 fix relative uri problem 2014-08-14 11:01:04 -04:00
mposolda
8419e5883d Ensure that transaction.isActive() is false after commit or rollback 2014-08-12 18:58:37 +02:00
mposolda
f0b66a2241 Admin console UI for sync of users from LDAP. Sync fixes 2014-08-12 18:12:27 +02:00
Stian Thorgersen
9d6e450c05 Fix test 2014-08-12 12:13:59 +01:00
Stian Thorgersen
f95418dfc9 KEYCLOAK-592 Display login form with error message if trying to login with social provider where email already exists 2014-08-12 12:06:13 +01: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
mposolda
ee79747cb6 Sync - first iteration 2014-08-10 23:22:35 +02:00
Bill Burke
9aa6b4cbfa optimize imports 2014-08-10 12:17:45 -04:00
Bill Burke
687e497455 test searchForUserByAttributes 2014-08-10 11:36:02 -04:00
Bill Burke
dc4e8603d7 change logout behavior 2014-08-08 18:33:37 -04:00
mposolda
1f12a2d67b Adding LDAPUtils. Bit refactoring LDAP test for easier testing with various servers 2014-08-08 10:40:34 +02:00
mposolda
c6af13c8cc Fix testsuite hangs on MySQL and PostgreSQL due to uncommited transactions 2014-08-07 20:38:20 +02:00
mposolda
5673fb34b1 Fix adding social link in mongo. Fixed export/import of federationProviders. Enhanced ExportImportTest 2014-08-07 17:33:48 +02:00
mposolda
76db33829b KEYCLOAK-600 Users shouldn't be registered with Federation Provider on an import 2014-08-07 12:38:56 +02:00
Bill Burke
99e6f0edad delete fed provider 2014-08-06 20:38:30 -04:00
Bill Burke
32a19563a5 KEYCLOAK-547 2014-08-06 19:15:52 -04:00
Bill Burke
aff32f69bb version 2014-08-06 15:44:50 -04:00
Bill Burke
ea0ceeb65d Merge pull request #589 from patriot1burke/master 
app full scope
 2014-08-04 16:26:51 -04:00
Bill Burke
731d75c756 app full scope by default 2014-08-04 16:04:10 -04:00
mposolda
5edb84ccfb Ensure that displayName is persisted. Add 'user' to ActiveDirectory classes 2014-08-04 16:42:48 +02:00
mposolda
46a0caf2e0 Upgrade to latest picketlink. Fix LDAP configuration according to that 2014-08-04 13:58:52 +02:00
Bill Burke
101a72cd65 remove AuthenticationProvider/Link 2014-08-01 18:03:48 -04:00
Bill Burke
c9851f1c05 add HttpServletRequest.authenticate() test 2014-08-01 15:50:20 -04:00
Bill Burke
d1c5c55a61 switch to a get 2014-08-01 13:28:17 -04:00
Bill Burke
bdc31d9459 Merge remote-tracking branch 'upstream/master' 2014-08-01 13:18:46 -04:00
Bill Burke
f08c42a37e token validation 2014-08-01 13:18:32 -04:00
Stian Thorgersen
6cbeeb1b1a KEYCLOAK-591 Require SSL for all external requests by default 2014-08-01 13:52:04 +01:00
Bill Burke
9f6c206078 ldap edit mode 2014-07-31 17:28:48 -04:00
Bill Burke
a084695978 support registration ldap 2014-07-31 15:22:20 -04:00
Bill Burke
b72a7db6fe federation display name 2014-07-31 10:51:04 -04:00
Bill Burke
d0dc75c06f federation ui 2014-07-30 22:52:39 -04:00
Bill Burke
8ea0d19d2f federation refactor 2014-07-30 16:01:54 -04:00
Stian Thorgersen
fcc4781e3a Updated admin endpoints and console to use oauth client name/clientId to retrieve a oauth client 2014-07-30 14:10:25 +01:00
Stian Thorgersen
614c718304 KEYCLOAK-581 Add login_hint query param to login 2014-07-30 13:43:46 +01:00
Rodrigo Sasaki
e338f1af15 Admin REST client 2014-07-30 13:24:44 +01:00
Stian Thorgersen
2b012ff238 Fix test 2014-07-30 09:47:16 +01:00
Stian Thorgersen
02a59812e6 Added ClientSessionModel to UserSessionProvider 2014-07-29 16:10:41 +01:00
Bill Burke
3bb0842eae federation iteration 2 2014-07-25 21:05:45 -04:00
Bill Burke
b1cd37814a rename 2014-07-25 10:40:46 -04:00
Bill Burke
1b14444eba rename FederationProvider to UserFederationProvider 2014-07-24 11:11:21 -04:00
Stian Thorgersen
b5835fc232 Added test to make sure password is verified with totp login 2014-07-24 14:15:02 +01:00
Stian Thorgersen
511cc483cb Moved audit/tests and model/tests to testsuite 2014-07-24 13:49:15 +01:00
Bill Burke
43d08f2d05 federation iteration 1 complete 2014-07-23 17:05:49 -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
Stian Thorgersen
0580c2223b KEYCLOAK-567 Added server-dep-min and server-dep-all poms 2014-07-22 14:10:38 +01: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
mposolda
3514d5cd78 Fix MySQL and PostgreSQL testsuite (was caused by uncommited transaction) 2014-07-22 07:53:05 +02:00
Stian Thorgersen
9ff4947abd Merge pull request #540 from mposolda/master 
Update DB profiles. Fix ExportImportTest to not clash with other tests
 2014-07-21 14:18:04 +01:00
Stian Thorgersen
213b685b43 KEYCLOAK-569 Check application roles for scope 2014-07-21 13:50:27 +01:00
mposolda
42df327104 Update DB profiles. Fix ExportImportTest to not clash with other tests 2014-07-21 08:48:25 +02:00
Stian Thorgersen
85621bdd9f KEYCLOAK-566 Configure db in keycloak-server.json instead of persistence.xml 2014-07-18 11:21:52 +01:00
mposolda
3dff4afe83 Export/import improvements and fixes 2014-07-17 21:31:33 +02:00
Stian Thorgersen
f00957ec3a Commented out test in ExportImportTest that breakes the other tests 2014-07-17 11:57:33 +01:00
mposolda
3c99350247 Fix testsuite to use mongo for realms,users and audit when keycloak.realm.provider=mongo 2014-07-17 11:05:51 +02:00
mposolda
0a15f873af Minor improvement in AbstractKeycloakRule.stopServer() 2014-07-17 10:14:35 +02:00
mposolda
8714193c97 Fix ExportImportTest to pass on windows 2014-07-16 20:00:18 +02:00
mposolda
1aff8af336 Enable ExportImportTest 2014-07-16 19:43:47 +02:00
Bill Burke
a5593469ae rename ModelProvider->RealmProvider 2014-07-15 15:44:50 -04:00
Bill Burke
484a4c1454 user provider refactor complete 2014-07-15 15:25:06 -04:00
Bill Burke
ff86bdc35f userprovider split 2014-07-15 12:11:12 -04:00
mposolda
726ce08700 More cleanup and removed export-import-impl module 2014-07-15 16:43:55 +02:00
mposolda
c14840a4c0 More cleanup after rebase 2014-07-15 14:44:38 +02:00
mposolda
24a492ffe0 Export/import refactoring to use same representation as admin endpoints 2014-07-15 05:35:24 +02:00
Stian Thorgersen
3f68180ee7 KEYCLOAK-512 Pagination support for sessions 2014-07-14 11:49:59 +01:00
Stian Thorgersen
d625fb014c Added JPA connection provider and added basic support for multiple transactions to KeycloakSession 2014-07-14 10:10:03 +01:00
Stian Thorgersen
86671a2354 Started UserSessionProvider 2014-07-10 16:48:25 +01:00
Stian Thorgersen
ad6d52cb0f Removed model methods from KeycloakSession 2014-07-08 15:27:42 +01:00
Bill Burke
48a0e564b9 fix json file 2014-07-07 18:51:38 -04: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
Bill Burke
df7aac01dd fix delete realm 2014-07-07 14:59:51 -04:00
Bill Burke
e99a675c50 HttpServletRequest.logout() 2014-07-03 14:08:19 -04:00
Stian Thorgersen
9ba61af83b Fix reset password test 2014-06-27 14:48:36 +01:00
Stian Thorgersen
34a1923d18 Refactor to prepar for splitting model 2014-06-27 09:39:06 +01:00
mposolda
b1cfab34fd Support for test of LDAP connection and authentication 2014-06-24 10:03:14 +02:00
Bill Burke
c780918501 perf test fix 2014-06-20 17:15:16 -04:00
Bill Burke
f0d02f24b1 user cache 2014-06-20 17:06:56 -04:00
Bill Burke
d21a19925b stateless access codes 2014-06-20 10:37:27 -04:00
Bill Burke
1eafb01c8d keycloak-521 2014-06-16 11:59:27 -04:00
Bill Burke
c71fdc72c7 keycloak-518 2014-06-16 10:43:50 -04:00
Bill Burke
f50177996d better fetch for role mappings 2014-06-16 10:15:53 -04:00
Bill Burke
ab87c03732 cache 1st iteration finished 2014-06-13 19:39:20 -04:00
Bill Burke
8eaf77b3c1 cache impl again 2014-06-13 19:05:05 -04:00
Bill Burke
cbea141a54 cache impl 2014-06-13 17:17:45 -04:00
Bill Burke
211a279248 Merge remote-tracking branch 'upstream/master' 2014-06-12 11:11:27 -04:00
Bill Burke
0dd06e3343 model refactor for caching 2014-06-10 18:50:08 -04:00
mposolda
0bfcbdb359 Support for Active Directory and RHDS 2014-06-09 16:20:19 +02:00
Bill Burke
2f3c8bf079 cache refactor 2014-06-06 15:12:58 -04:00
Stian Thorgersen
5f6687ec62 KEYCLOAK-244 Social should be stateless 2014-06-05 10:09:17 +01:00
Bill Burke
9410adf9ce fix deadlocks 2014-06-02 21:33:43 -04:00
Stian Thorgersen
eb47d43497 For installed app urn redirect to a page instead of returning the html, this is to prevent NPE if page is refreshed 2014-05-21 10:32:03 +01:00
Bill Burke
79828ddc78 Merge pull request #409 from patriot1burke/master 
fix urn redirect uri
 2014-05-20 16:15:40 -04:00
Bill Burke
fcca9dd90a fix urn redirect uri 2014-05-20 16:15:13 -04:00
Stian Thorgersen
b09e2f697e Email audit listener 2014-05-20 17:04:17 +01:00
Bill Burke
b3dd349342 check redirect uri exists in token service 2014-05-20 11:38:35 -04:00
Stian Thorgersen
cc97265c06 Add realm option to enable/disable Resource Owner Password Credentials Grant 2014-05-20 11:32:22 +01:00
Bill Burke
b5aa9efefb fix remove expired sessions 2014-05-19 18:53:28 -04:00
Bill Burke
95f56e2e62 fix removeexpired sessions 2014-05-19 18:33:54 -04:00
Stian Thorgersen
a3d08e7191 Added theme support to emails 2014-05-19 17:34:58 +01: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
Bill Burke
67e3e60f28 test sso idle, logout on idle 2014-05-15 23:10:14 -04:00
Bill Burke
27efd3c0a4 ssoSessionIdleTimeout refactor 2014-05-15 13:53:28 -04:00
Bill Burke
07dbb7d7b7 check ssl required in adapter 2014-05-14 15:23:45 -04:00
Bill Burke
0e0dfb60e0 composite role mapping listing 2014-05-14 10:37:50 -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
Stian Thorgersen
6f0b12174c KEYCLOAK-432 Added user sessions 2014-05-09 11:52:45 +01:00
Bill Burke
2d949b63b5 keycloak.js login for admin 2014-05-08 19:55:57 -04:00
Bill Burke
f987d331b7 /rest removal and pom fixes 2014-05-06 20:43:01 -04:00
Bill Burke
64f591769a remove /rest from RealmsResource 2014-05-06 20:21:49 -04:00