Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbellone
cbellone committed Apr 19, 2024
1 parent 23983ed commit d1c09c4
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 35 deletions.
36 changes: 19 additions & 17 deletions build.gradle
View file
Expand Up @@ -15,7 +15,7 @@ buildscript {
dependencies {
classpath 'org.postgresql:postgresql:42.5.1'
//this is for processing the index.html at compile time
classpath "ch.digitalfondue.jfiveparse:jfiveparse:1.0.0"
classpath "ch.digitalfondue.jfiveparse:jfiveparse:1.0.3"
//
}

Expand All @@ -32,13 +32,13 @@ plugins {
id 'java'
id 'idea'
id 'org.kordamp.gradle.jacoco' version '0.54.0'
id 'com.github.ben-manes.versions' version '0.50.0'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.hierynomus.license' version '0.16.1'
id 'net.researchgate.release' version '3.0.2'
id 'org.springframework.boot' version '3.2.0'
id 'org.sonarqube' version '4.4.1.3373'
// id 'net.ltgt.errorprone' version '3.1.0'
id 'com.github.node-gradle.node' version '7.0.1'
id 'com.github.node-gradle.node' version '7.0.2'
}

apply plugin: 'java'
Expand Down Expand Up @@ -103,54 +103,56 @@ repositories {

dependencies {
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
implementation 'com.auth0:java-jwt:4.2.1'
implementation 'com.auth0:java-jwt:4.4.0'
implementation "com.fasterxml.jackson.core:jackson-core"
implementation "com.fasterxml.jackson.core:jackson-databind"
implementation "org.springframework.boot:spring-boot-properties-migrator", {
exclude module : 'spring-boot-starter-logging'
}
implementation 'org.springframework.session:spring-session-jdbc'
implementation "ch.digitalfondue.npjt-extra:npjt-extra:2.0.4"
implementation "com.samskivert:jmustache:1.15"
implementation "com.samskivert:jmustache:1.16"
implementation 'com.moodysalem:LatLongToTimezoneMaven:1.2'
/**/
implementation 'com.openhtmltopdf:openhtmltopdf-core:1.0.10'
implementation 'com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10'
implementation 'ch.digitalfondue.jfiveparse:jfiveparse:1.0.0'
implementation 'ch.digitalfondue.jfiveparse:jfiveparse:1.0.3'
/**/
implementation 'com.google.zxing:core:3.5.1'
implementation 'com.google.zxing:javase:3.5.1'
implementation 'com.google.zxing:core:3.5.3'
implementation 'com.google.zxing:javase:3.5.3'
implementation "org.flywaydb:flyway-core"
implementation "org.postgresql:postgresql"
implementation "com.zaxxer:HikariCP"

/**/

implementation "com.stripe:stripe-java:22.4.0"
implementation "com.stripe:stripe-java:25.3.0"
implementation 'com.paypal.sdk:checkout-sdk:2.0.0'
implementation 'com.google.code.gson:gson:2.10'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.2', {
exclude module: 'gson'
}

implementation "org.apache.commons:commons-lang3:3.13.0"
implementation 'com.opencsv:opencsv:5.9'
implementation 'com.opencsv:opencsv:5.9', {
exclude module: 'commons-collections:commons-collections:3.2.2'
}
implementation 'commons-codec:commons-codec:1.15'
implementation 'net.sf.biweekly:biweekly:0.6.6'
implementation 'com.atlassian.commonmark:commonmark:0.17.0'
implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.17.0'
implementation 'com.ryantenney.passkit4j:passkit4j:2.0.1'
implementation 'com.github.ben-manes.caffeine:caffeine'
implementation 'com.github.scribejava:scribejava-core:8.3.3'
implementation 'ch.digitalfondue.vatchecker:vatchecker:1.5.0'
implementation 'ch.digitalfondue.basicxlsx:basicxlsx:0.5.1'
implementation 'ch.digitalfondue.vatchecker:vatchecker:1.6.0'
implementation 'ch.digitalfondue.basicxlsx:basicxlsx:0.7.1'
implementation 'org.imgscalr:imgscalr-lib:4.2'
implementation 'org.mozilla:rhino-runtime:1.7.13'
implementation 'com.google.auth:google-auth-library-oauth2-http:1.18.0'
implementation 'com.google.auth:google-auth-library-oauth2-http:1.23.0'

testImplementation 'org.testcontainers:testcontainers:1.19.3'
testImplementation 'org.testcontainers:postgresql:1.19.3'
testImplementation 'org.testcontainers:junit-jupiter:1.19.3'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:postgresql'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation "org.springframework.boot:spring-boot-starter-test", {
exclude module : 'spring-boot-starter-logging'
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/alfio/config/SpringBootInitializer.java
View file
Expand Up @@ -19,7 +19,6 @@
import alfio.util.ClockProvider;
import com.openhtmltopdf.util.XRLog;
import jakarta.servlet.Filter;
import jakarta.servlet.ServletContext;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.web.server.Cookie;
import org.springframework.boot.web.servlet.ServletContextInitializer;
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/alfio/config/authentication/APITokenAuthWebSecurity.java
View file
Expand Up @@ -33,6 +33,7 @@
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand Down Expand Up @@ -100,9 +101,9 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
});


return http.securityMatchers().requestMatchers(RequestTypeMatchers::isTokenAuthentication)
.and()
.sessionManagement(management -> management.sessionCreationPolicy(SessionCreationPolicy.STATELESS)).csrf(csrf -> csrf.disable())
return http.securityMatchers(matchers -> matchers.requestMatchers(RequestTypeMatchers::isTokenAuthentication))
.sessionManagement(management -> management.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.csrf(AbstractHttpConfigurer::disable)

Check failure

Code scanning / CodeQL

Disabled Spring CSRF protection High

CSRF vulnerability due to protection being disabled.
.authorizeHttpRequests(APITokenAuthWebSecurity::configureMatchers)
.addFilter(filter)
.build();
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/alfio/controller/AdminConfigurationController.java
View file
Expand Up @@ -21,8 +21,9 @@
import alfio.manager.payment.StripeConnectManager;
import alfio.manager.user.UserManager;
import alfio.util.oauth2.AccessTokenResponseDetails;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -32,8 +33,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import java.security.Principal;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -99,7 +98,7 @@ public String authorize(Principal principal,
}
} else if(stateVerified && StringUtils.isNotEmpty(errorCode)) {
log.warn("error from {}. {}={}", provider, errorCode, errorDescription);
redirectAttributes.addFlashAttribute("errorMessage", StringUtils.defaultString(errorDescription, errorCode));
redirectAttributes.addFlashAttribute("errorMessage", Objects.toString(errorDescription, errorCode));
return REDIRECT_ADMIN;
}
redirectAttributes.addFlashAttribute("errorMessage", "Couldn't connect your account. Please retry.");
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/alfio/controller/api/admin/EventApiController.java
View file
Expand Up @@ -44,6 +44,8 @@
import alfio.util.*;
import com.opencsv.CSVReader;
import com.opencsv.exceptions.CsvException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
Expand All @@ -63,8 +65,6 @@
import org.springframework.validation.Errors;
import org.springframework.web.bind.annotation.*;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
Expand All @@ -89,7 +89,6 @@
import static alfio.util.Wrappers.optionally;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
import static org.apache.commons.lang3.StringUtils.defaultString;

@RestController
@RequestMapping("/admin/api")
Expand Down Expand Up @@ -427,7 +426,7 @@ private Stream<String[]> exportLines(String eventName, Principal principal, List
boolean paymentGatewayRequested = fields.contains(PAYMENT_METHOD);
if((paymentIdRequested || paymentGatewayRequested)) {
Optional<Transaction> transaction = trs.getTransaction();
if(paymentIdRequested) { line.add(defaultString(transaction.map(Transaction::getPaymentId).orElse(null), transaction.map(Transaction::getTransactionId).orElse(""))); }
if(paymentIdRequested) { line.add(Objects.toString(transaction.map(Transaction::getPaymentId).orElse(null), transaction.map(Transaction::getTransactionId).orElse(""))); }
if(paymentGatewayRequested) { line.add(transaction.map(tr -> tr.getPaymentProxy().name()).orElse("")); }
}

Expand Down
6 changes: 2 additions & 4 deletions src/main/java/alfio/controller/api/admin/UsersApiController.java
View file
Expand Up @@ -29,9 +29,9 @@
import alfio.util.Json;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.tuple.Pair;
Expand All @@ -43,7 +43,6 @@
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.*;

import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.security.Principal;
Expand All @@ -52,7 +51,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.trimToNull;

@RestController
Expand Down Expand Up @@ -222,7 +220,7 @@ private static Pair<String, byte[]> generateApiKeyQRCode(User user, String baseU
Map<String, String> info = new HashMap<>();
info.put("apiKey", user.getUsername());
info.put("baseUrl", baseUrl);
String description = defaultString(trimToNull(user.getDescription()), user.getUsername());
String description = Objects.toString(trimToNull(user.getDescription()), user.getUsername());
return Pair.of(description, ImageUtil.createQRCodeWithDescription(Json.GSON.toJson(info), description));
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/alfio/manager/SpecialPriceManager.java
View file
Expand Up @@ -111,7 +111,7 @@ public boolean sendCodeToAssignee(List<SendCodeModification> input, String event
ContentLanguage defaultLocale = eventLanguages.contains(ContentLanguage.ENGLISH) ? ContentLanguage.ENGLISH : eventLanguages.get(0);
set.forEach(m -> {
var messageSource = messageSourceManager.getMessageSourceFor(event);
Locale locale = LocaleUtil.forLanguageTag(StringUtils.defaultString(StringUtils.trimToNull(m.getLanguage()), defaultLocale.getLanguage()));
Locale locale = LocaleUtil.forLanguageTag(Objects.toString(StringUtils.trimToNull(m.getLanguage()), defaultLocale.getLanguage()));
var usePartnerCode = configurationManager.getFor(USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL, event.getConfigurationLevel()).getValueAsBooleanOrDefault();
var promoCodeDescription = messageSource.getMessage("show-event.promo-code-type."+(usePartnerCode ? "partner" : "promotional"), null, null, locale);
Map<String, Object> model = TemplateResource.prepareModelForSendReservedCode(organization, event, m, eventManager.getEventUrl(event), promoCodeDescription);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/alfio/manager/TicketReservationManager.java
View file
Expand Up @@ -1776,7 +1776,7 @@ static String buildCompleteBillingAddress(CustomerName customerName,
.orElse(null);
}

return Arrays.stream(stripAll(defaultString(companyName, fullName), billingAddressLine1, billingAddressLine2, stripToEmpty(billingAddressZip) + " " + stripToEmpty(billingAddressCity) + " " + stripToEmpty(billingAddressState), stripToNull(country)))
return Arrays.stream(stripAll(Objects.toString(companyName, fullName), billingAddressLine1, billingAddressLine2, stripToEmpty(billingAddressZip) + " " + stripToEmpty(billingAddressCity) + " " + stripToEmpty(billingAddressState), stripToNull(country)))
.filter(Predicate.not(StringUtils::isEmpty))
.collect(joining("\n"));
}
Expand Down

0 comments on commit d1c09c4

Please sign in to comment.