From de71fb841b39204eaf8cd39d8803cd5801558972 Mon Sep 17 00:00:00 2001 From: kataus Date: Fri, 28 Feb 2020 18:53:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20=D0=BA?= =?UTF-8?q?=2024=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82=D0=B8=D1=8E=20(Spring=20?= =?UTF-8?q?Security=20-=20ACL)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 2019-11/spring-24-SS-ACL/pom.xml | 82 +++++++++++++++++++ .../src/main/java/ru/otus/spring/Main.java | 14 ++++ .../ru/otus/spring/config/SwaggerConfig.java | 23 ++++++ .../ru/otus/spring/model/NoticeMessage.java | 33 ++++++++ .../repository/NoticeMessageRepository.java | 25 ++++++ .../spring/rest/NoticeMessageController.java | 35 ++++++++ .../ru/otus/spring/security/AclConfig.java | 79 ++++++++++++++++++ .../AclMethodSecurityConfiguration.java | 22 +++++ .../security/SecurityConfiguration.java | 60 ++++++++++++++ .../src/main/resources/application.yml | 7 ++ .../src/main/resources/data.sql | 26 ++++++ .../src/main/resources/schema.sql | 58 +++++++++++++ .../src/main/resources/templates/error.html | 9 ++ .../src/main/resources/templates/index.html | 15 ++++ 14 files changed, 488 insertions(+) create mode 100644 2019-11/spring-24-SS-ACL/pom.xml create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/Main.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/model/NoticeMessage.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/repository/NoticeMessageRepository.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/rest/NoticeMessageController.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclConfig.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclMethodSecurityConfiguration.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/SecurityConfiguration.java create mode 100644 2019-11/spring-24-SS-ACL/src/main/resources/application.yml create mode 100644 2019-11/spring-24-SS-ACL/src/main/resources/data.sql create mode 100644 2019-11/spring-24-SS-ACL/src/main/resources/schema.sql create mode 100644 2019-11/spring-24-SS-ACL/src/main/resources/templates/error.html create mode 100644 2019-11/spring-24-SS-ACL/src/main/resources/templates/index.html diff --git a/2019-11/spring-24-SS-ACL/pom.xml b/2019-11/spring-24-SS-ACL/pom.xml new file mode 100644 index 00000000..49358ba4 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + ru.otus + spring-framework-22-acl + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + 2.6.11 + 2.8.0 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.security + spring-security-acl + + + net.sf.ehcache + ehcache-core + ${ehcache-core.version} + jar + + + org.springframework + spring-context-support + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + + + + io.springfox + springfox-swagger2 + ${swagger.version} + + + io.springfox + springfox-swagger-ui + ${swagger.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/Main.java new file mode 100644 index 00000000..baca49d5 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/Main.java @@ -0,0 +1,14 @@ +package ru.otus.spring; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; + +@SpringBootApplication +public class Main { + + public static void main(String[] args) { + SpringApplication.run(Main.class); + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java new file mode 100644 index 00000000..92854b5f --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java @@ -0,0 +1,23 @@ +package ru.otus.spring.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import ru.otus.spring.rest.NoticeMessageController; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class SwaggerConfig { + + @Bean + public Docket productApi() { + return new Docket(DocumentationType.SWAGGER_2) + .useDefaultResponseMessages(false) + .select() + .apis(RequestHandlerSelectors.basePackage(NoticeMessageController.class.getPackage().getName())) + .build(); + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/model/NoticeMessage.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/model/NoticeMessage.java new file mode 100644 index 00000000..21457970 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/model/NoticeMessage.java @@ -0,0 +1,33 @@ +package ru.otus.spring.model; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "system_message") +public class NoticeMessage { + + @Id + @Column + private Integer id; + @Column + private String content; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/repository/NoticeMessageRepository.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/repository/NoticeMessageRepository.java new file mode 100644 index 00000000..4588eb21 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/repository/NoticeMessageRepository.java @@ -0,0 +1,25 @@ +package ru.otus.spring.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.query.Param; +import org.springframework.security.access.prepost.PostAuthorize; +import org.springframework.security.access.prepost.PostFilter; +import org.springframework.security.access.prepost.PreAuthorize; +import ru.otus.spring.model.NoticeMessage; + +import java.util.List; +import java.util.Optional; + +public interface NoticeMessageRepository extends JpaRepository { + + @PostFilter("hasPermission(filterObject, 'READ')") + List findAll(); + + @PostAuthorize("hasPermission(returnObject, 'READ')") + NoticeMessage getById(Integer id); + + @SuppressWarnings("unchecked") + @PreAuthorize("hasPermission(#noticeMessage, 'WRITE')") + NoticeMessage save(@Param("noticeMessage") NoticeMessage noticeMessage); + +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/rest/NoticeMessageController.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/rest/NoticeMessageController.java new file mode 100644 index 00000000..fbf59c52 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/rest/NoticeMessageController.java @@ -0,0 +1,35 @@ +package ru.otus.spring.rest; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.otus.spring.model.NoticeMessage; +import ru.otus.spring.repository.NoticeMessageRepository; + +import java.util.List; + +@RestController +public class NoticeMessageController { + + private final NoticeMessageRepository repository; + + public NoticeMessageController(NoticeMessageRepository repository) { + this.repository = repository; + } + + @GetMapping("/message") + public List getAll() { + return repository.findAll(); + } + + @GetMapping("/message/{id}") + public NoticeMessage getById(@PathVariable("id") Integer id) { + return repository.getById(id); + } + + @PutMapping("/message") + public NoticeMessage getById(NoticeMessage message) { + return repository.save(message); + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclConfig.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclConfig.java new file mode 100644 index 00000000..36d7376a --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclConfig.java @@ -0,0 +1,79 @@ +package ru.otus.spring.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.ehcache.EhCacheFactoryBean; +import org.springframework.cache.ehcache.EhCacheManagerFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; +import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; +import org.springframework.security.acls.AclPermissionCacheOptimizer; +import org.springframework.security.acls.AclPermissionEvaluator; +import org.springframework.security.acls.domain.*; +import org.springframework.security.acls.jdbc.BasicLookupStrategy; +import org.springframework.security.acls.jdbc.JdbcMutableAclService; +import org.springframework.security.acls.jdbc.LookupStrategy; +import org.springframework.security.acls.model.PermissionGrantingStrategy; +import org.springframework.security.core.authority.SimpleGrantedAuthority; + +import javax.sql.DataSource; +import java.util.Objects; + +@Configuration +public class AclConfig { + + @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") + @Autowired + private DataSource dataSource; + + @Bean + public EhCacheBasedAclCache aclCache() { + return new EhCacheBasedAclCache( + Objects.requireNonNull(aclEhCacheFactoryBean().getObject()), + permissionGrantingStrategy(), + aclAuthorizationStrategy() + ); + } + + @Bean + public EhCacheFactoryBean aclEhCacheFactoryBean() { + EhCacheFactoryBean ehCacheFactoryBean = new EhCacheFactoryBean(); + ehCacheFactoryBean.setCacheManager(aclCacheManager().getObject()); + ehCacheFactoryBean.setCacheName("aclCache"); + return ehCacheFactoryBean; + } + + @Bean + public EhCacheManagerFactoryBean aclCacheManager() { + return new EhCacheManagerFactoryBean(); + } + + @Bean + public PermissionGrantingStrategy permissionGrantingStrategy() { + return new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()); + } + + @Bean + public AclAuthorizationStrategy aclAuthorizationStrategy() { + return new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_EDITOR")); + } + + @Bean + public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() { + DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler(); + AclPermissionEvaluator permissionEvaluator = new AclPermissionEvaluator(aclService()); + expressionHandler.setPermissionEvaluator(permissionEvaluator); + expressionHandler.setPermissionCacheOptimizer(new AclPermissionCacheOptimizer(aclService())); + return expressionHandler; + } + + @Bean + public LookupStrategy lookupStrategy() { + return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(), new ConsoleAuditLogger()); + } + + @Bean + public JdbcMutableAclService aclService() { + return new JdbcMutableAclService(dataSource, lookupStrategy(), aclCache()); + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclMethodSecurityConfiguration.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclMethodSecurityConfiguration.java new file mode 100644 index 00000000..b66620ba --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/AclMethodSecurityConfiguration.java @@ -0,0 +1,22 @@ +package ru.otus.spring.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration; + +@Configuration +@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +public class AclMethodSecurityConfiguration extends GlobalMethodSecurityConfiguration { + + @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") + @Autowired + MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler; + + @Override + protected MethodSecurityExpressionHandler createExpressionHandler() { + return defaultMethodSecurityExpressionHandler; + } + +} diff --git a/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/SecurityConfiguration.java b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/SecurityConfiguration.java new file mode 100644 index 00000000..ecdfd7f1 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/java/ru/otus/spring/security/SecurityConfiguration.java @@ -0,0 +1,60 @@ +package ru.otus.spring.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.PasswordEncoder; + +@EnableWebSecurity +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + + @Override + public void configure(WebSecurity web) { + web.ignoring().antMatchers("/swagger-ui.html") + .antMatchers("/webjars/springfox-swagger-ui/**") + .antMatchers("/swagger-resources/**") + .antMatchers("/v2/api-docs") + .antMatchers("/h2-console/**"); + } + + @Override + public void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + //.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) + //.and() + .authorizeRequests().antMatchers("/**").permitAll() + .and() + .formLogin() + .and() + .logout().logoutUrl("/logout"); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new PasswordEncoder() { + @Override + public String encode(CharSequence charSequence) { + return charSequence.toString(); + } + + @Override + public boolean matches(CharSequence charSequence, String s) { + return charSequence.toString().equals(s); + } + }; + } + + @Autowired + public void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication() + .withUser("admin").password("password").roles("EDITOR") + .and() + .withUser("user").password("password").roles("USER") + .and() + .withUser("someone").password("password").roles("SOMEONE"); + } +} diff --git a/2019-11/spring-24-SS-ACL/src/main/resources/application.yml b/2019-11/spring-24-SS-ACL/src/main/resources/application.yml new file mode 100644 index 00000000..9a70d12a --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/resources/application.yml @@ -0,0 +1,7 @@ +spring: + h2: + console: + enabled: true + jpa: + hibernate: + ddl-auto: none diff --git a/2019-11/spring-24-SS-ACL/src/main/resources/data.sql b/2019-11/spring-24-SS-ACL/src/main/resources/data.sql new file mode 100644 index 00000000..42fe5631 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/resources/data.sql @@ -0,0 +1,26 @@ +INSERT INTO acl_sid (id, principal, sid) VALUES +(1, 1, 'admin'), +(2, 1, 'user'), +(3, 0, 'ROLE_EDITOR'); + +INSERT INTO acl_class (id, class) VALUES +(1, 'ru.otus.spring.model.NoticeMessage'); + +INSERT INTO system_message(id,content) VALUES +(1,'First Level Message'), +(2,'Second Level Message'), +(3,'Third Level Message'); + +INSERT INTO acl_object_identity (id, object_id_class, object_id_identity, parent_object, owner_sid, entries_inheriting) VALUES +(1, 1, 1, NULL, 3, 0), +(2, 1, 2, NULL, 3, 0), +(3, 1, 3, NULL, 3, 0); + +INSERT INTO acl_entry (id, acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure) VALUES +(1, 1, 1, 1, 1, 1, 1, 1), +(2, 1, 2, 1, 2, 1, 1, 1), +(3, 1, 3, 3, 1, 1, 1, 1), +(4, 2, 1, 2, 1, 1, 1, 1), +(5, 2, 2, 3, 1, 1, 1, 1), +(6, 3, 1, 3, 1, 1, 1, 1), +(7, 3, 2, 3, 2, 1, 1, 1); diff --git a/2019-11/spring-24-SS-ACL/src/main/resources/schema.sql b/2019-11/spring-24-SS-ACL/src/main/resources/schema.sql new file mode 100644 index 00000000..9f740482 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/resources/schema.sql @@ -0,0 +1,58 @@ +create table IF NOT EXISTS system_message (id integer not null, content varchar(255), primary key (id)); + +CREATE TABLE IF NOT EXISTS acl_sid ( + id bigint(20) NOT NULL AUTO_INCREMENT, + principal tinyint(1) NOT NULL, + sid varchar(100) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY unique_uk_1 (sid,principal) +); + +CREATE TABLE IF NOT EXISTS acl_class ( + id bigint(20) NOT NULL AUTO_INCREMENT, + class varchar(255) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY unique_uk_2 (class) +); + +CREATE TABLE IF NOT EXISTS acl_entry ( + id bigint(20) NOT NULL AUTO_INCREMENT, + acl_object_identity bigint(20) NOT NULL, + ace_order int(11) NOT NULL, + sid bigint(20) NOT NULL, + mask int(11) NOT NULL, + granting tinyint(1) NOT NULL, + audit_success tinyint(1) NOT NULL, + audit_failure tinyint(1) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY unique_uk_4 (acl_object_identity,ace_order) +); + +CREATE TABLE IF NOT EXISTS acl_object_identity ( + id bigint(20) NOT NULL AUTO_INCREMENT, + object_id_class bigint(20) NOT NULL, + object_id_identity bigint(20) NOT NULL, + parent_object bigint(20) DEFAULT NULL, + owner_sid bigint(20) DEFAULT NULL, + entries_inheriting tinyint(1) NOT NULL, + PRIMARY KEY (id), + UNIQUE KEY unique_uk_3 (object_id_class,object_id_identity) +); + +ALTER TABLE acl_entry +ADD FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id); + +ALTER TABLE acl_entry +ADD FOREIGN KEY (sid) REFERENCES acl_sid(id); + +-- +-- Constraints for table acl_object_identity +-- +ALTER TABLE acl_object_identity +ADD FOREIGN KEY (parent_object) REFERENCES acl_object_identity (id); + +ALTER TABLE acl_object_identity +ADD FOREIGN KEY (object_id_class) REFERENCES acl_class (id); + +ALTER TABLE acl_object_identity +ADD FOREIGN KEY (owner_sid) REFERENCES acl_sid (id); \ No newline at end of file diff --git a/2019-11/spring-24-SS-ACL/src/main/resources/templates/error.html b/2019-11/spring-24-SS-ACL/src/main/resources/templates/error.html new file mode 100644 index 00000000..f28b51df --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/resources/templates/error.html @@ -0,0 +1,9 @@ + + + + + + +Вам доступ запрещён! + + diff --git a/2019-11/spring-24-SS-ACL/src/main/resources/templates/index.html b/2019-11/spring-24-SS-ACL/src/main/resources/templates/index.html new file mode 100644 index 00000000..79347f42 --- /dev/null +++ b/2019-11/spring-24-SS-ACL/src/main/resources/templates/index.html @@ -0,0 +1,15 @@ + + + + + + +login +
+logout +
+h2-console +
+/swagger + +