From 0840d2895069f1fbad3484abb6d16f02b421f558 Mon Sep 17 00:00:00 2001 From: Tudor Stanciu Date: Fri, 25 Nov 2022 09:06:58 +0200 Subject: [PATCH] Remove secrets from source code --- IdentityServer.Api/Dockerfile | 2 +- IdentityServer.Api/appsettings.json | 3 +-- .../IdentityServer.Domain.Data.csproj | 6 ------ .../Scripts/1.0.1/03.Add admin user.sql | 13 ------------- .../Scripts/1.0.1/04.Add my user.sql | 16 ---------------- Notes.txt | 10 ++++------ NuGet.config | 1 - build-amd64.sh | 2 +- 8 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 IdentityServer.Domain.Data/Scripts/1.0.1/03.Add admin user.sql delete mode 100644 IdentityServer.Domain.Data/Scripts/1.0.1/04.Add my user.sql diff --git a/IdentityServer.Api/Dockerfile b/IdentityServer.Api/Dockerfile index f88b15c..ce69f26 100644 --- a/IdentityServer.Api/Dockerfile +++ b/IdentityServer.Api/Dockerfile @@ -27,7 +27,7 @@ WORKDIR /app COPY --from=publish /app/publish . ENV urls="http://*:80" -ENV ConnectionStrings__DatabaseConnection="***REMOVED***" +ENV ConnectionStrings__DatabaseConnection="*********************************" ENV TZ=Europe/Bucharest RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/IdentityServer.Api/appsettings.json b/IdentityServer.Api/appsettings.json index 4c5739b..f3b6759 100644 --- a/IdentityServer.Api/appsettings.json +++ b/IdentityServer.Api/appsettings.json @@ -1,8 +1,7 @@ { "urls": "http://*:5063", "ConnectionStrings": { - "DatabaseConnection": "***REMOVED***" - //"DatabaseConnection": "***REMOVED***" + "DatabaseConnection": "Server=######;Database=######;User Id=######;Password=######;MultipleActiveResultSets=true" }, "Logging": { "LogLevel": { diff --git a/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj b/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj index 9ea6772..93c700d 100644 --- a/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj +++ b/IdentityServer.Domain.Data/IdentityServer.Domain.Data.csproj @@ -28,12 +28,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - diff --git a/IdentityServer.Domain.Data/Scripts/1.0.1/03.Add admin user.sql b/IdentityServer.Domain.Data/Scripts/1.0.1/03.Add admin user.sql deleted file mode 100644 index 5618abf..0000000 --- a/IdentityServer.Domain.Data/Scripts/1.0.1/03.Add admin user.sql +++ /dev/null @@ -1,13 +0,0 @@ -if not exists (select top 1 1 from AppUser where UserName = '***REMOVED***') -begin - declare @activeStatusId int - select @activeStatusId = StatusId from UserStatus where StatusCode = 'ACTIVE' - - insert into AppUser(UserName, [Password], FirstName, CreationDate, SecurityStamp, StatusId) - select '***REMOVED***' as UserName, - '***REMOVED***' as [Password], - ***REMOVED*** as FirstName, - getdate() as CreationDate, - cast(newid() as varchar(100)) as SecurityStamp, - @activeStatusId as StatusId -end \ No newline at end of file diff --git a/IdentityServer.Domain.Data/Scripts/1.0.1/04.Add my user.sql b/IdentityServer.Domain.Data/Scripts/1.0.1/04.Add my user.sql deleted file mode 100644 index e46d63c..0000000 --- a/IdentityServer.Domain.Data/Scripts/1.0.1/04.Add my user.sql +++ /dev/null @@ -1,16 +0,0 @@ -if not exists (select top 1 1 from AppUser where UserName = '***REMOVED***') -begin - declare @activeStatusId int - select @activeStatusId = StatusId from UserStatus where StatusCode = 'ACTIVE' - - insert into AppUser(UserName, [Password], FirstName, LastName, Email, ProfilePictureUrl, CreationDate, SecurityStamp, StatusId) - select '***REMOVED***' as UserName, - '***REMOVED***' as [Password], - ***REMOVED*** as FirstName, - ***REMOVED*** as LastName, - '***REMOVED******REMOVED***' as Email, - ***REMOVED*** as ProfilePictureUrl, - getdate() as CreationDate, - cast(newid() as varchar(100)) as SecurityStamp, - @activeStatusId as StatusId -end \ No newline at end of file diff --git a/Notes.txt b/Notes.txt index c597bbf..ab63131 100644 --- a/Notes.txt +++ b/Notes.txt @@ -9,15 +9,13 @@ sc create IdentityServer.Api binPath= "" ####################################################################################################################################################### Push language package: -dotnet nuget push IdentityServer.PublishedLanguage.1.1.0.nupkg -k ***REMOVED*** -s http://***REMOVED***/NuGetServer/nuget -dotnet nuget push IdentityServer.Wrapper.1.1.0.nupkg -k ***REMOVED*** -s http://***REMOVED***/NuGetServer/nuget +dotnet nuget push IdentityServer.PublishedLanguage.1.1.0.nupkg -k ******** -s http://***REMOVED***/NuGetServer/nuget +dotnet nuget push IdentityServer.Wrapper.1.1.0.nupkg -k ******** -s http://***REMOVED***/NuGetServer/nuget ####################################################################################################################################################### TO DO: - Cache for users -####################################################################################################################################################### -Azure DevOps Repository Password: ***REMOVED*** ####################################################################################################################################################### Docker commands: ***************** @@ -34,14 +32,14 @@ Push image to registry: docker tag identity-server-api:1.0.1 cloud.canister.io:5000/tstanciu/identity-server:api-1.0.1 --login to registry -docker login --username=tstanciu --password="***REMOVED***" cloud.canister.io:5000 +docker login --username=tstanciu --password="********" cloud.canister.io:5000 --push image docker push cloud.canister.io:5000/tstanciu/identity-server:api-1.0.1 Pull image from registry --login to registry with readonly rights -docker login --username=***REMOVED*** --password=***REMOVED*** cloud.canister.io:5000 +docker login --username=***REMOVED*** --password=******** cloud.canister.io:5000 --pull image docker pull cloud.canister.io:5000/tstanciu/identity-server:api-1.0.1 diff --git a/NuGet.config b/NuGet.config index 832df21..6c7c767 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - \ No newline at end of file diff --git a/build-amd64.sh b/build-amd64.sh index 30bc214..7af68e6 100644 --- a/build-amd64.sh +++ b/build-amd64.sh @@ -3,7 +3,7 @@ echo "Welcome!" version="1.1.3-alpha3" -localRegistryPass="***REMOVED***" +localRegistryPass="************" echo "Create docker image with version $version." docker image build -t "identity-server:$version" -f "IdentityServer.Api/Dockerfile" .