Skip to content

Commit d4ebcbd

Browse files
committed
Security Improvement
1 parent caec81f commit d4ebcbd

File tree

6 files changed

+135
-114
lines changed

6 files changed

+135
-114
lines changed

Dockerfile-Kubernetes

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
22

3-
RUN sed -i "s|MinProtocol = TLSv1.2|MinProtocol = TLSv1|g" /etc/ssl/openssl.cnf && \
4-
sed -i 's|CipherString = DEFAULT@SECLEVEL=2|CipherString = DEFAULT@SECLEVEL=1|g' /etc/ssl/openssl.cnf
3+
RUN sed -i 's/\[openssl_init\]/# [openssl_init]/' /etc/ssl/openssl.cnf &&\
4+
printf "\n\n[openssl_init]\nssl_conf = ssl_sect" >> /etc/ssl/openssl.cnf &&\
5+
printf "\n\n[ssl_sect]\nsystem_default = ssl_default_sect" >> /etc/ssl/openssl.cnf &&\
6+
printf "\n\n[ssl_default_sect]\nMinProtocol = TLSv1\nCipherString = DEFAULT@SECLEVEL=0\n" >> /etc/ssl/openssl.cnf
57

68
RUN apt-get update && apt-get install -y --no-install-recommends curl
79

@@ -15,17 +17,20 @@ COPY . ./
1517

1618
RUN dotnet publish Gnoss.BackgroundTask.CacheRefresh/Gnoss.BackgroundTask.CacheRefresh.csproj -c Release -o out
1719

18-
FROM mcr.microsoft.com/dotnet/aspnet:6.0
20+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
1921

20-
RUN sed -i "s|MinProtocol = TLSv1.2|MinProtocol = TLSv1|g" /etc/ssl/openssl.cnf && \
21-
sed -i 's|CipherString = DEFAULT@SECLEVEL=2|CipherString = DEFAULT@SECLEVEL=1|g' /etc/ssl/openssl.cnf
22+
RUN sed -i 's/\[openssl_init\]/# [openssl_init]/' /etc/ssl/openssl.cnf &&\
23+
printf "\n\n[openssl_init]\nssl_conf = ssl_sect" >> /etc/ssl/openssl.cnf &&\
24+
printf "\n\n[ssl_sect]\nsystem_default = ssl_default_sect" >> /etc/ssl/openssl.cnf &&\
25+
printf "\n\n[ssl_default_sect]\nMinProtocol = TLSv1\nCipherString = DEFAULT@SECLEVEL=0\n" >> /etc/ssl/openssl.cnf
2226

2327
RUN apt-get update && apt-get install -y --no-install-recommends curl
2428

2529
WORKDIR /app
26-
RUN useradd -r gnoss
27-
RUN chown -R gnoss:gnoss /app
28-
RUN chmod -R 777 /app
30+
RUN groupadd -g 1000 gnoss && useradd -u 1000 -g 1000 gnoss &&\
31+
mkdir -p logs trazas &&\
32+
chown -R gnoss:gnoss logs trazas && chmod -R 777 logs trazas
33+
2934
USER gnoss
3035

3136
COPY --from=build-env /app/out .

Gnoss.BackgroundTask.CacheRefresh/CacheRefreshWorker.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Es.Riam.Gnoss.CL.ServiciosGenerales;
12
using Es.Riam.Gnoss.Servicios;
23
using Es.Riam.Gnoss.Util.Configuracion;
34
using Es.Riam.Gnoss.Win.RefrescoCache;
@@ -16,19 +17,20 @@ public class CacheRefreshWorker : Worker
1617
{
1718
private readonly ILogger<CacheRefreshWorker> _logger;
1819
private readonly ConfigService _configService;
19-
20-
public CacheRefreshWorker(ILogger<CacheRefreshWorker> logger, ConfigService configService, IServiceScopeFactory scopeFactory) : base(logger, scopeFactory)
20+
private ILoggerFactory mLoggerFactory;
21+
public CacheRefreshWorker(ILogger<CacheRefreshWorker> logger, ConfigService configService, IServiceScopeFactory scopeFactory, ILoggerFactory loggerFactory) : base(logger, scopeFactory)
2122
{
2223
_logger = logger;
2324
_configService = configService;
25+
mLoggerFactory = loggerFactory;
2426
}
2527

2628
protected override List<ControladorServicioGnoss> ObtenerControladores()
2729
{
2830
List<ControladorServicioGnoss> controladores = new List<ControladorServicioGnoss>();
2931
int numMaxPeticionesWebSimultaneas = _configService.ObtenerNumMaxPeticionesWebSimultaneas();
3032

31-
controladores.Add(new ControladorRefrescoCache(numMaxPeticionesWebSimultaneas, ScopedFactory, _configService));
33+
controladores.Add(new ControladorRefrescoCache(numMaxPeticionesWebSimultaneas, ScopedFactory, _configService, mLoggerFactory.CreateLogger<ControladorRefrescoCache>(), mLoggerFactory));
3234
return controladores;
3335
}
3436
}

0 commit comments

Comments
 (0)