Skip to content
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.

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

Add OpenId support for end customers #1006

Merged
merged 20 commits into from
May 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ junitVersion=5.1.0
systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"

# https://jitpack.io/#alfio-event/alf.io-public-frontend -> go to commit tab, set the version
alfioPublicFrontendVersion=c8e4a7e51f
alfioPublicFrontendVersion=e17c3e2203
54 changes: 54 additions & 0 deletions src/main/java/alfio/config/BaseConfiguration.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/**
* This file is part of alf.io.
*
* alf.io is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* alf.io is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with alf.io. If not, see <http://www.gnu.org/licenses/>.
*/
package alfio.config;

import alfio.manager.system.ConfigurationManager;
import alfio.manager.system.ExternalConfiguration;
import alfio.manager.user.UserManager;
import alfio.model.system.ConfigurationKeys;
import alfio.repository.EventRepository;
import alfio.repository.system.ConfigurationRepository;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

import java.time.Duration;
import java.util.Map;
import java.util.Set;

@Configuration
public class BaseConfiguration {

@Bean
ConfigurationManager configurationManager(ConfigurationRepository configurationRepository,
UserManager userManager,
EventRepository eventRepository,
ExternalConfiguration externalConfiguration,
Environment environment) {
Cache<Set<ConfigurationKeys>, Map<ConfigurationKeys, ConfigurationManager.MaybeConfiguration>> cache = Caffeine.newBuilder()
.expireAfterWrite(Duration.ofMinutes(1))
.build();
return new ConfigurationManager(configurationRepository,
userManager,
eventRepository,
externalConfiguration,
environment,
cache);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package alfio.config;

import alfio.config.authentication.support.OpenIdAlfioAuthentication;
import lombok.extern.log4j.Log4j2;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
Expand All @@ -26,7 +27,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;

import javax.servlet.http.HttpServletRequest;
import java.sql.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
Expand Down Expand Up @@ -67,6 +69,14 @@ private static boolean isLoggedUser() {
return false;
}

private static boolean isPublic() {
SecurityContext context = SecurityContextHolder.getContext();
if (context != null && context.getAuthentication() instanceof OpenIdAlfioAuthentication) {
return ((OpenIdAlfioAuthentication) context.getAuthentication()).isPublicUser();
}
return false;
}

private static boolean isAdmin() {
if(isLoggedUser()) {
return SecurityContextHolder.getContext().getAuthentication()
Expand All @@ -85,7 +95,7 @@ public static void prepareTransactionalConnection(Connection connection) throws
if (!isInAHttpRequest()) {
return;
}
boolean mustCheck = !isCurrentlyInAPublicUrlRequest() && isLoggedUser() && !isAdmin();
boolean mustCheck = !isCurrentlyInAPublicUrlRequest() && isLoggedUser() && !isPublic() && !isAdmin();
if (!mustCheck) {
return;
}
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/alfio/config/SpringBootLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ public static void main(String[] args) {
Thread.setDefaultUncaughtExceptionHandler(new DefaultExceptionHandler());
String profiles = System.getProperty("spring.profiles.active", "");

SpringApplication application = new SpringApplication(SpringBootInitializer.class, DataSourceConfiguration.class, WebSecurityConfig.class, MvcConfiguration.class);
SpringApplication application = new SpringApplication(
SpringBootInitializer.class,
BaseConfiguration.class,
DataSourceConfiguration.class,
WebSecurityConfig.class,
MvcConfiguration.class);
List<String> additionalProfiles = new ArrayList<>();
additionalProfiles.add(Initializer.PROFILE_SPRING_BOOT);
if("true".equals(System.getenv("ALFIO_LOG_STDOUT_ONLY"))) {
Expand All @@ -49,6 +54,6 @@ public static void main(String[] args) {
application.setAdditionalProfiles(additionalProfiles.toArray(new String[0]));
ConfigurableApplicationContext applicationContext = application.run(args);
ConfigurableEnvironment environment = applicationContext.getEnvironment();
log.info("profiles: requested {}, active {}", profiles, String.join(", ", (CharSequence[]) environment.getActiveProfiles()));
log.info("profiles: requested {}, active {}", profiles, String.join(", ", environment.getActiveProfiles()));
}
}
Loading