You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/18 17:48:32 UTC
[ambari] 01/01: Merge pull request #147 from
apache/branch-feature-AMBARI-20859
This is an automated email from the ASF dual-hosted git repository.
rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 1eca6769fec9474b072502c41e8033fc3d6a4777
Merge: 1a6548a 6ecbcbe
Author: Robert Levas <rl...@users.noreply.github.com>
AuthorDate: Thu Jan 18 12:48:27 2018 -0500
Merge pull request #147 from apache/branch-feature-AMBARI-20859
Merge branch-feature-AMBARI-20859 into trunk
.../main/resources/ui/admin-web/app/scripts/app.js | 2 +-
.../stackVersions/StackVersionsEditCtrl.js | 2 +-
.../ui/admin-web/app/scripts/services/User.js | 9 +
.../src/main/resources/ui/admin-web/bower.json | 11 +-
.../src/main/resources/ui/admin-web/package.json | 2 +-
.../main/package/rpm/logfeeder/postremove.sh~HEAD | 21 +
.../main/package/rpm/logfeeder/postremove.sh~trunk | 21 +
.../src/main/package/rpm/portal/postremove.sh~HEAD | 21 +
.../main/package/rpm/portal/postremove.sh~trunk | 21 +
.../src/main/scripts/logfeeder-env.sh~HEAD | 40 +
.../src/main/scripts/logfeeder-env.sh~trunk | 40 +
.../src/main/scripts/logsearch-env.sh~HEAD | 40 +
.../src/main/scripts/logsearch-env.sh~trunk | 40 +
ambari-server/docs/api/generated/index.html | 30360 +++++++++++--------
ambari-server/docs/api/generated/swagger.json | 4906 +--
.../docs/api/v1/authentication-source-create.md | 86 +
.../docs/api/v1/authentication-source-delete.md | 49 +
.../docs/api/v1/authentication-source-get.md | 93 +
.../docs/api/v1/authentication-source-list.md | 116 +
.../docs/api/v1/authentication-source-resources.md | 117 +
.../docs/api/v1/authentication-source-update.md | 104 +
ambari-server/docs/api/v1/index.md | 12 +
ambari-server/docs/api/v1/user-create.md | 107 +
ambari-server/docs/api/v1/user-delete.md | 48 +
ambari-server/docs/api/v1/user-get.md | 97 +
ambari-server/docs/api/v1/user-list.md | 98 +
ambari-server/docs/api/v1/user-resources.md | 175 +
ambari-server/docs/api/v1/user-update.md | 115 +
ambari-server/docs/configuration/index.md | 10 +-
.../ambari/server/api/AmbariErrorHandler.java | 2 +-
.../api/resources/ResourceInstanceFactoryImpl.java | 4 +
.../api/resources/UserResourceDefinition.java | 1 +
.../ambari/server/api/services/BaseService.java | 70 +-
.../users/UserAuthenticationSourceService.java | 223 +
.../server/api/services/users/UserService.java | 132 +-
.../ambari/server/audit/event/LoginAuditEvent.java | 20 +
.../ambari/server/configuration/Configuration.java | 132 +-
.../controller/AmbariManagementController.java | 39 -
.../controller/AmbariManagementControllerImpl.java | 147 -
.../ambari/server/controller/AmbariServer.java | 24 +-
.../ambari/server/controller/ControllerModule.java | 4 +
.../server/controller/ResourceProviderFactory.java | 6 +
.../UserAuthenticationSourceRequest.java | 82 +
...erAuthenticationSourceRequestCreateSwagger.java | 40 +
...erAuthenticationSourceRequestUpdateSwagger.java | 40 +
.../UserAuthenticationSourceResponse.java | 127 +
.../ambari/server/controller/UserRequest.java | 50 +-
.../controller/UserRequestCreateUserSwagger.java | 49 +
.../controller/UserRequestCreateUsersSwagger.java | 52 +
.../controller/UserRequestUpdateUserSwagger.java | 52 +
.../ambari/server/controller/UserResponse.java | 87 +-
.../AbstractControllerResourceProvider.java | 4 +-
.../ActiveWidgetLayoutResourceProvider.java | 2 +-
.../UserAuthenticationSourceResourceProvider.java | 417 +
.../internal/UserPrivilegeResourceProvider.java | 19 +-
.../controller/internal/UserResourceProvider.java | 482 +-
.../ambari/server/controller/spi/Resource.java | 2 +
.../org/apache/ambari/server/orm/DBAccessor.java | 29 +
.../server/orm/dao/UserAuthenticationDAO.java | 116 +
.../org/apache/ambari/server/orm/dao/UserDAO.java | 95 +-
.../orm/entities/UserAuthenticationEntity.java | 189 +
.../ambari/server/orm/entities/UserEntity.java | 253 +-
.../AccountDisabledException.java} | 23 +-
.../AmbariAuthenticationEventHandler.java | 64 +
.../AmbariAuthenticationEventHandlerImpl.java | 168 +
.../AmbariAuthenticationException.java} | 25 +-
.../authentication/AmbariAuthenticationFilter.java | 10 +
.../AmbariAuthenticationProvider.java | 117 +
.../AmbariBasicAuthenticationFilter.java | 97 +-
.../AmbariJWTAuthenticationFilter.java | 140 -
.../AmbariLocalAuthenticationProvider.java | 113 +
.../AmbariUserAuthentication.java | 5 +-
.../AuthenticationMethodNotAllowedException.java | 65 +
...nvalidUsernamePasswordCombinationException.java | 22 +-
.../TooManyLoginFailuresException.java} | 14 +-
.../authentication/UserNotFoundException.java} | 35 +-
.../jwt/AmbariJwtAuthenticationFilter.java} | 270 +-
.../jwt/AmbariJwtAuthenticationProvider.java | 136 +
.../jwt/JwtAuthenticationProperties.java | 2 +-
.../jwt/JwtAuthenticationToken.java} | 34 +-
.../AmbariAuthToLocalUserDetailsService.java | 163 +-
.../AmbariKerberosAuthenticationFilter.java | 76 +-
.../AmbariKerberosAuthenticationProperties.java | 26 +-
.../pam/AmbariPamAuthenticationProvider.java | 302 +
.../pam/PamAuthenticationFactory.java | 21 +-
.../authorization/AmbariAuthentication.java | 229 -
.../authorization/AmbariAuthorizationFilter.java | 4 +-
.../AmbariLdapAuthenticationProvider.java | 176 +-
.../AmbariLdapAuthoritiesPopulator.java | 5 +-
.../authorization/AmbariLocalUserProvider.java | 107 -
.../AmbariPamAuthenticationProvider.java | 252 -
.../AmbariUserAuthorizationFilter.java | 12 +-
...ionException.java => AuthenticationMethod.java} | 19 +-
.../authorization/AuthorizationHelper.java | 4 +-
.../authorization/LdapServerProperties.java | 9 +
.../ambari/server/security/authorization/User.java | 61 +-
.../{UserType.java => UserAuthenticationType.java} | 5 +-
.../server/security/authorization/Users.java | 1255 +-
.../AmbariInternalAuthenticationProvider.java | 4 +-
.../authorization/jwt/JwtAuthentication.java | 34 -
.../security/ldap/AmbariLdapDataPopulator.java | 76 +-
.../ambari/server/security/ldap/LdapBatchDto.java | 32 +-
.../ambari/server/upgrade/UpgradeCatalog300.java | 393 +
ambari-server/src/main/python/ambari-server.py | 1 -
.../main/python/ambari_server/kerberos_setup.py | 2 -
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 33 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 35 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 33 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 32 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 34 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 36 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../HDP/2.0.6/properties/stack_packages.json | 6 +
.../resources/webapp/WEB-INF/spring-security.xml | 13 +-
.../api/resources/UserResourceDefinitionTest.java | 13 +-
.../ambari/server/audit/LoginAuditEventTest.java | 36 +-
.../server/configuration/ConfigurationTest.java | 12 +-
.../controller/AmbariManagementControllerTest.java | 73 -
.../AbstractPrivilegeResourceProviderTest.java | 38 -
.../ActiveWidgetLayoutResourceProviderTest.java | 4 +-
.../GroupPrivilegeResourceProviderTest.java | 46 +-
.../controller/internal/RequestImplTest.java | 7 -
...erAuthenticationSourceResourceProviderTest.java | 448 +
.../UserPrivilegeResourceProviderTest.java | 109 +-
.../internal/UserResourceProviderDBTest.java | 438 +-
.../internal/UserResourceProviderTest.java | 749 +-
.../ambari/server/orm/DBAccessorImplTest.java | 30 +
.../apache/ambari/server/orm/OrmTestHelper.java | 7 +-
.../apache/ambari/server/orm/dao/UserDAOTest.java | 53 +-
.../server/security/SecurityHelperImplTest.java | 7 +-
.../server/security/TestAuthenticationFactory.java | 26 +-
.../AbstractAuthenticationProviderTest.java | 217 +
.../AmbariBasicAuthenticationFilterTest.java | 136 +-
.../AmbariJWTAuthenticationFilterTest.java | 191 -
.../AmbariLocalAuthenticationProviderTest.java | 90 +
.../jwt/AmbariJwtAuthenticationFilterTest.java | 493 +
.../jwt/JwtAuthenticationPropertiesTest.java | 2 +-
.../AmbariAuthToLocalUserDetailsServiceTest.java | 33 +-
.../AmbariKerberosAuthenticationFilterTest.java | 183 +-
...AmbariKerberosAuthenticationPropertiesTest.java | 16 -
.../pam/AmbariPamAuthenticationProviderTest.java | 285 +
.../authorization/AmbariAuthenticationTest.java | 334 -
.../AmbariAuthorizationFilterTest.java | 5 +-
...AmbariAuthorizationProviderDisableUserTest.java | 99 -
...apAuthenticationProviderForDNWithSpaceTest.java | 25 +-
...AuthenticationProviderForDuplicateUserTest.java | 9 +-
.../AmbariLdapAuthenticationProviderTest.java | 32 +-
.../authorization/AmbariLocalUserProviderTest.java | 166 -
.../AmbariPamAuthenticationProviderTest.java | 151 -
.../AmbariUserAuthenticationFilterTest.java | 20 +-
.../authorization/AuthorizationHelperTest.java | 24 +-
.../TestAmbariLdapAuthoritiesPopulator.java | 4 +-
.../server/security/authorization/TestUsers.java | 320 +-
.../server/security/authorization/UsersTest.java | 15 +-
.../jwt/JwtAuthenticationFilterTest.java | 373 -
.../security/ldap/AmbariLdapDataPopulatorTest.java | 238 +-
.../server/upgrade/UpgradeCatalog300Test.java | 252 +-
157 files changed, 30434 insertions(+), 19960 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.