This commit is contained in:
David Štaleker
2024-03-13 16:05:35 +01:00
16 changed files with 148 additions and 174 deletions

3
.gitignore vendored
View File

@@ -185,7 +185,8 @@ publish/
*.azurePubxml *.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings, # Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted # but database connection strings (with potential passwords) will be unencrypted
*.pubxml #Uposevamo publish profile
#*.pubxml
*.publishproj *.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to # Microsoft Azure Web App publish settings. Comment the next line if you want to

View File

@@ -18,6 +18,7 @@ RUN dotnet build "./ZpcBulletinBoard.csproj" -c $BUILD_CONFIGURATION -o /app/bui
FROM build AS publish FROM build AS publish
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./ZpcBulletinBoard.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false RUN dotnet publish "./ZpcBulletinBoard.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
COPY ["./ZpcBulletinBoard/Keys/key-3a63e3da-2ef0-49c2-9e68-30571c991f22.xml", "ZpcBulletinBoard/Keys/key-3a63e3da-2ef0-49c2-9e68-30571c991f22.xml"]
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app

View File

@@ -119,8 +119,8 @@ namespace ZpcBulletinBoard.Pages.User
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
//TODO samo za DEV //TODO samo za DEV
//var result = await _loginManager.PasswordSignInAsync(Input.UserName, Input.Password, Input.RememberLogin, false); var result = await _loginManager.PasswordSignInAsync(Input.UserName, Input.Password, Input.RememberLogin, false);
var result = await _loginManager.PasswordSignInAsync("Admin", "*zpcBulletinBoard2024*", Input.RememberLogin, false); //var result = await _loginManager.PasswordSignInAsync("Admin", "*zpcBulletinBoard2024*", Input.RememberLogin, false);
if (result.Succeeded) if (result.Succeeded)
{ {

View File

@@ -90,7 +90,7 @@ builder.Services.Configure<IISOptions>(options =>
options.AutomaticAuthentication = false; options.AutomaticAuthentication = false;
}); });
builder.Services.AddDataProtection().SetApplicationName("ZpcBulletinBoard").PersistKeysToFileSystem(new DirectoryInfo(@"Keys/")); builder.Services.AddDataProtection().SetApplicationName("ZpcBulletinBoard").PersistKeysToFileSystem(new DirectoryInfo(@"wwwroot/keys/"));
var app = builder.Build(); var app = builder.Build();

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<WebPublishMethod>Container</WebPublishMethod>
<ContainerPublishMethod>NetSdk</ContainerPublishMethod>
<RegistryUrl>docker.zapecnik.com</RegistryUrl>
<UserName>david</UserName>
<PublishImageTag>latest</PublishImageTag>
<PublishProvider>ContainerRegistry</PublishProvider>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<ProjectGuid>707627f1-2251-4416-a5ea-93c98d8eed1a</ProjectGuid>
<_IsDockerfilePresent>true</_IsDockerfilePresent>
<_TargetId>NetSdkCustomContainerRegistry</_TargetId>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<WebPublishMethod>Container</WebPublishMethod>
<ContainerPublishMethod>NetSdk</ContainerPublishMethod>
<RegistryUrl>docker.zapecnik.com</RegistryUrl>
<UserName>david</UserName>
<PublishImageTag>latest</PublishImageTag>
<PublishProvider>ContainerRegistry</PublishProvider>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<ProjectGuid>707627f1-2251-4416-a5ea-93c98d8eed1a</ProjectGuid>
<_IsDockerfilePresent>true</_IsDockerfilePresent>
<_TargetId>NetSdkCustomContainerRegistry</_TargetId>
</PropertyGroup>
</Project>

View File

@@ -34,10 +34,13 @@
<ItemGroup> <ItemGroup>
<Folder Include="Migrations\" /> <Folder Include="Migrations\" />
<Folder Include="Properties\PublishProfiles\" />
<Folder Include="wwwroot\bulletin-board-images\notes\" /> <Folder Include="wwwroot\bulletin-board-images\notes\" />
<Folder Include="wwwroot\bulletin-board-images\pages\" /> <Folder Include="wwwroot\bulletin-board-images\pages\" />
<Folder Include="wwwroot\img\" /> <Folder Include="wwwroot\img\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Properties\PublishProfiles\docker.zapecnik.com.pubxml.user" />
</ItemGroup>
</Project> </Project>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 22 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 22 MiB

View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<key id="3a63e3da-2ef0-49c2-9e68-30571c991f22" version="1"> <key id="dd9d2694-d2a1-4c84-8780-8cc2a8450e4b" version="1">
<creationDate>2024-02-27T04:54:17.6808298Z</creationDate> <creationDate>2024-03-13T04:20:53.7153581Z</creationDate>
<activationDate>2024-02-27T04:54:17.6419309Z</activationDate> <activationDate>2024-03-13T04:20:53.6880609Z</activationDate>
<expirationDate>2024-05-27T04:54:17.6419309Z</expirationDate> <expirationDate>2024-06-11T04:20:53.6880609Z</expirationDate>
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60"> <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<descriptor> <descriptor>
<encryption algorithm="AES_256_CBC" /> <encryption algorithm="AES_256_CBC" />
<validation algorithm="HMACSHA256" /> <validation algorithm="HMACSHA256" />
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection"> <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
<!-- Warning: the key below is in an unencrypted form. --> <!-- Warning: the key below is in an unencrypted form. -->
<value>1ujUNFqnvXGLHSTiSV2F9ymK+Sosgl6qdy7m0M/Z9bPXyplHR9bOAgm4cy5otT3C/q5H/Qf6NnQkgUqggldGiw==</value> <value>1XXNVBuC3ok1caM9YT8GT0kQE7/8eRQiPgWe36qOTqXhGZVuy4HAnRi6XaxFTcWdNys7KEpjf8YWHyuwHfxm9g==</value>
</masterKey> </masterKey>
</descriptor> </descriptor>
</descriptor> </descriptor>