Skip to content

Commit b47f579

Browse files
authored
Merge pull request #993 from Aguafrommars/master
7.3 preview
2 parents 14f06da + 6234094 commit b47f579

File tree

1,424 files changed

+18648
-27194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,424 files changed

+18648
-27194
lines changed

.github/workflows/check-dependencies.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ jobs:
3333
- name: Setup .NET Core SDK
3434
uses: actions/[email protected]
3535
with:
36-
dotnet-version: 7.0.x
37-
include-prerelease: true
36+
dotnet-version: 7.0.*
37+
# Restore workload
38+
- name: Restore workload
39+
run: dotnet workload restore
3840
# Run update depencies script
3941
- name: Update dependencies
4042
run: ./update-dependencies.ps1

.github/workflows/codeql-analysis.yml renamed to .github/workflows/codeql-analysis-cs.yml

+9-21
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'csharp', 'javascript' ]
35+
language: [ 'csharp' ]
3636
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3737
# Learn more:
3838
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
@@ -43,8 +43,7 @@ jobs:
4343
- name: Install .NET sdk
4444
uses: actions/setup-dotnet@v1
4545
with:
46-
dotnet-version: '7.0.x'
47-
include-prerelease: true
46+
dotnet-version: 7.0.*
4847
- name: Setup wasm tools
4948
run: dotnet workload install wasm-tools
5049
env:
@@ -61,23 +60,12 @@ jobs:
6160
# Prefix the list here with "+" to use these queries and those in the config file.
6261
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6362

64-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
65-
# If this step fails, then you should remove it and run the build manually (see below)
66-
- name: Autobuild
67-
uses: github/codeql-action/autobuild@v1
68-
env:
69-
GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
70-
71-
# ℹ️ Command-line programs to run using the OS shell.
72-
# 📚 https://git.io/JvXDl
73-
74-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
75-
# and modify them (or add more) to build your code if your project
76-
# uses a compiled language
77-
78-
#- run: |
79-
# make bootstrap
80-
# make release
81-
63+
# Restore nuget package
64+
- run: dotnet restore
65+
name: Restore
66+
# Build
67+
- run: dotnet build -c Release
68+
name: Build
69+
8270
- name: Perform CodeQL Analysis
8371
uses: github/codeql-action/analyze@v1
+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master, preview/*, release/* ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
schedule:
21+
- cron: '23 3 * * 2'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'javascript' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37+
# Learn more:
38+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
39+
40+
steps:
41+
- name: Checkout repository
42+
uses: actions/checkout@v2
43+
- name: Install .NET sdk
44+
uses: actions/setup-dotnet@v1
45+
with:
46+
dotnet-version: '7.0.200'
47+
include-prerelease: true
48+
- name: Setup wasm tools
49+
run: dotnet workload restore
50+
env:
51+
GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
52+
# Initializes the CodeQL tools for scanning.
53+
- name: Initialize CodeQL
54+
uses: github/codeql-action/init@v2
55+
env:
56+
GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
57+
with:
58+
languages: ${{ matrix.language }}
59+
# If you wish to specify custom queries, you can do so here or in a config file.
60+
# By default, queries listed here will override any specified in a config file.
61+
# Prefix the list here with "+" to use these queries and those in the config file.
62+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
63+
64+
# Restore nuget package
65+
- run: dotnet restore
66+
name: Restore
67+
# Build
68+
- run: dotnet build -c Release
69+
name: Builde
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v2

.github/workflows/docker.yml

+2-33
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Login to DockerHub
2727
uses: docker/login-action@v1
2828
with:
29-
username: aguacongas
29+
username: theidserverowner
3030
password: ${{ secrets.DOCKER_HUB_PAT }}
3131
- name: 'Checkout'
3232
uses: actions/checkout@v3
@@ -47,37 +47,6 @@ jobs:
4747
push: true
4848
file: src/Aguacongas.TheIdServer.Duende/Dockerfile
4949
tags: aguacongas/theidserver.duende:${{ steps.previoustag.outputs.tag }}
50-
is4:
51-
runs-on: ubuntu-latest
52-
steps:
53-
- name: Set up QEMU
54-
uses: docker/setup-qemu-action@v1
55-
- name: Set up Docker Buildx
56-
uses: docker/setup-buildx-action@v1
57-
- name: Login to DockerHub
58-
uses: docker/login-action@v1
59-
with:
60-
username: aguacongas
61-
password: ${{ secrets.DOCKER_HUB_PAT }}
62-
- name: 'Checkout'
63-
uses: actions/checkout@v3
64-
with:
65-
fetch-depth: 0
66-
- name: 'Get Previous tag'
67-
id: previoustag
68-
uses: "WyriHaximus/github-action-get-previous-tag@v1"
69-
with:
70-
fallback: 1.0.0
71-
- name: Build and push TheIdServer
72-
id: docker_build_theidserver
73-
uses: docker/build-push-action@v2
74-
env:
75-
GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
76-
with:
77-
build-args: GITHIB_FEED_TOKEN=${{ secrets.GITHIB_FEED_TOKEN }} FILE_VERSION=${{ steps.previoustag.outputs.tag }}.0 SOURCE_VERSION=${{ github.sha }}
78-
push: true
79-
file: src/Aguacongas.TheIdServer.IS4/Dockerfile
80-
tags: aguacongas/theidserver:${{ steps.previoustag.outputs.tag }}
8150
app:
8251
runs-on: ubuntu-latest
8352
steps:
@@ -88,7 +57,7 @@ jobs:
8857
- name: Login to DockerHub
8958
uses: docker/login-action@v1
9059
with:
91-
username: aguacongas
60+
username: theidserverowner
9261
password: ${{ secrets.DOCKER_HUB_PAT }}
9362
- name: 'Checkout'
9463
uses: actions/checkout@v3

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,7 @@ override.tf.json
375375
# example: *tfplan*
376376
/sample/Aguacongas.TheIdServer.MtlsSample/client.pks
377377
/sample/Aguacongas.TheIdServer.MtlsSample/.dccache
378+
/src/Aguacongas.TheIdServer.Duende/TheIdServer.db
379+
/src/Aguacongas.TheIdServer.Duende/TheIdServer.db-shm
380+
/src/Aguacongas.TheIdServer.Duende/TheIdServer.db-wal
381+
/global.json

.sonarlint/TheIdServer.slconfig

+13-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,21 @@
77
"ProjectKey": "aguacongas_TheIdServer",
88
"ProjectName": "TheIdServer",
99
"Profiles": {
10+
"Secrets": {
11+
"ProfileKey": "AYXoTKWz9Ao2yLWbM0n6",
12+
"ProfileTimestamp": "2023-01-25T09:40:14Z"
13+
},
1014
"CSharp": {
1115
"ProfileKey": "AW8e9NVJZPoDbtkGSYCm",
12-
"ProfileTimestamp": "2021-05-05T07:40:16Z"
16+
"ProfileTimestamp": "2023-02-22T15:28:25Z"
17+
},
18+
"Js": {
19+
"ProfileKey": "AW8POwb8PHYyZX2yhorZ",
20+
"ProfileTimestamp": "2023-01-25T09:26:55Z"
21+
},
22+
"Ts": {
23+
"ProfileKey": "AW8POwb8PHYyZX2yhore",
24+
"ProfileTimestamp": "2023-01-25T09:47:40Z"
1325
}
1426
}
1527
}

.sonarlint/aguacongas_theidserver/CSharp/SonarLint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<AnalysisInput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2+
<AnalysisInput xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<Settings>
44
<Setting>
55
<Key>sonar.cs.analyzeGeneratedCode</Key>

.sonarlint/aguacongas_theidservercsharp.ruleset

+20-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RuleSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="SonarQube - TheIdServer Aguacongas" Description="This rule set was automatically generated from SonarQube https://sonarcloud.io/profiles/show?key=AW8e9NVJZPoDbtkGSYCm" ToolsVersion="14.0">
2+
<RuleSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="SonarQube - TheIdServer Aguacongas" Description="This rule set was automatically generated from SonarQube https://sonarcloud.io/profiles/show?key=AW8e9NVJZPoDbtkGSYCm" ToolsVersion="14.0">
33
<Rules AnalyzerId="SonarAnalyzer.CSharp" RuleNamespace="SonarAnalyzer.CSharp">
44
<Rule Id="S100" Action="None" />
55
<Rule Id="S1006" Action="Warning" />
@@ -28,10 +28,10 @@
2828
<Rule Id="S1125" Action="Info" />
2929
<Rule Id="S1128" Action="None" />
3030
<Rule Id="S113" Action="None" />
31+
<Rule Id="S1133" Action="Info" />
3132
<Rule Id="S1134" Action="Warning" />
3233
<Rule Id="S1135" Action="Info" />
3334
<Rule Id="S1144" Action="Warning" />
34-
<Rule Id="S1145" Action="None" />
3535
<Rule Id="S1147" Action="None" />
3636
<Rule Id="S1151" Action="None" />
3737
<Rule Id="S1155" Action="Info" />
@@ -72,7 +72,6 @@
7272
<Rule Id="S1659" Action="None" />
7373
<Rule Id="S1694" Action="None" />
7474
<Rule Id="S1696" Action="None" />
75-
<Rule Id="S1697" Action="None" />
7675
<Rule Id="S1698" Action="None" />
7776
<Rule Id="S1699" Action="Warning" />
7877
<Rule Id="S1751" Action="Warning" />
@@ -89,21 +88,23 @@
8988
<Rule Id="S1944" Action="Warning" />
9089
<Rule Id="S1994" Action="None" />
9190
<Rule Id="S2053" Action="Warning" />
92-
<Rule Id="S2070" Action="None" />
9391
<Rule Id="S2114" Action="Warning" />
9492
<Rule Id="S2115" Action="Warning" />
9593
<Rule Id="S2123" Action="Warning" />
9694
<Rule Id="S2148" Action="None" />
9795
<Rule Id="S2156" Action="None" />
96+
<Rule Id="S2166" Action="Warning" />
9897
<Rule Id="S2178" Action="Warning" />
9998
<Rule Id="S2183" Action="Info" />
10099
<Rule Id="S2184" Action="Info" />
101100
<Rule Id="S2187" Action="Warning" />
102101
<Rule Id="S2190" Action="Warning" />
103102
<Rule Id="S2197" Action="None" />
103+
<Rule Id="S2198" Action="Warning" />
104104
<Rule Id="S2201" Action="Warning" />
105105
<Rule Id="S2219" Action="Info" />
106106
<Rule Id="S2221" Action="None" />
107+
<Rule Id="S2222" Action="Warning" />
107108
<Rule Id="S2223" Action="Warning" />
108109
<Rule Id="S2225" Action="Warning" />
109110
<Rule Id="S2228" Action="None" />
@@ -112,7 +113,6 @@
112113
<Rule Id="S2252" Action="Warning" />
113114
<Rule Id="S2259" Action="Warning" />
114115
<Rule Id="S2275" Action="Warning" />
115-
<Rule Id="S2278" Action="None" />
116116
<Rule Id="S2290" Action="Warning" />
117117
<Rule Id="S2291" Action="Warning" />
118118
<Rule Id="S2292" Action="Info" />
@@ -155,7 +155,6 @@
155155
<Rule Id="S2743" Action="Warning" />
156156
<Rule Id="S2755" Action="Warning" />
157157
<Rule Id="S2757" Action="Warning" />
158-
<Rule Id="S2758" Action="None" />
159158
<Rule Id="S2760" Action="None" />
160159
<Rule Id="S2761" Action="Warning" />
161160
<Rule Id="S2857" Action="Warning" />
@@ -174,7 +173,9 @@
174173
<Rule Id="S3010" Action="Warning" />
175174
<Rule Id="S3011" Action="Warning" />
176175
<Rule Id="S3052" Action="None" />
176+
<Rule Id="S3059" Action="None" />
177177
<Rule Id="S3060" Action="Warning" />
178+
<Rule Id="S3063" Action="Warning" />
178179
<Rule Id="S3168" Action="Warning" />
179180
<Rule Id="S3169" Action="Warning" />
180181
<Rule Id="S3172" Action="Warning" />
@@ -199,11 +200,13 @@
199200
<Rule Id="S3254" Action="None" />
200201
<Rule Id="S3256" Action="Info" />
201202
<Rule Id="S3257" Action="None" />
203+
<Rule Id="S3260" Action="Info" />
202204
<Rule Id="S3261" Action="Info" />
203205
<Rule Id="S3262" Action="Warning" />
204206
<Rule Id="S3263" Action="Warning" />
205207
<Rule Id="S3264" Action="Warning" />
206208
<Rule Id="S3265" Action="Warning" />
209+
<Rule Id="S3267" Action="Warning" />
207210
<Rule Id="S3329" Action="Warning" />
208211
<Rule Id="S3343" Action="Warning" />
209212
<Rule Id="S3346" Action="Warning" />
@@ -243,7 +246,6 @@
243246
<Rule Id="S3610" Action="Warning" />
244247
<Rule Id="S3626" Action="Info" />
245248
<Rule Id="S3655" Action="Warning" />
246-
<Rule Id="S3693" Action="None" />
247249
<Rule Id="S3717" Action="None" />
248250
<Rule Id="S3776" Action="Warning" />
249251
<Rule Id="S3869" Action="Warning" />
@@ -253,6 +255,7 @@
253255
<Rule Id="S3875" Action="Warning" />
254256
<Rule Id="S3876" Action="None" />
255257
<Rule Id="S3877" Action="Warning" />
258+
<Rule Id="S3878" Action="Info" />
256259
<Rule Id="S3880" Action="None" />
257260
<Rule Id="S3881" Action="Warning" />
258261
<Rule Id="S3884" Action="Warning" />
@@ -325,7 +328,6 @@
325328
<Rule Id="S4069" Action="None" />
326329
<Rule Id="S4070" Action="Warning" />
327330
<Rule Id="S4136" Action="Info" />
328-
<Rule Id="S4142" Action="None" />
329331
<Rule Id="S4143" Action="Warning" />
330332
<Rule Id="S4144" Action="Warning" />
331333
<Rule Id="S4158" Action="Info" />
@@ -335,7 +337,7 @@
335337
<Rule Id="S4210" Action="Warning" />
336338
<Rule Id="S4211" Action="Warning" />
337339
<Rule Id="S4212" Action="None" />
338-
<Rule Id="S4214" Action="Warning" />
340+
<Rule Id="S4214" Action="None" />
339341
<Rule Id="S4220" Action="Warning" />
340342
<Rule Id="S4225" Action="None" />
341343
<Rule Id="S4226" Action="None" />
@@ -346,10 +348,9 @@
346348
<Rule Id="S4423" Action="Warning" />
347349
<Rule Id="S4426" Action="Warning" />
348350
<Rule Id="S4428" Action="Warning" />
349-
<Rule Id="S4432" Action="None" />
350351
<Rule Id="S4433" Action="Warning" />
351352
<Rule Id="S4456" Action="Warning" />
352-
<Rule Id="S4457" Action="Warning" />
353+
<Rule Id="S4457" Action="None" />
353354
<Rule Id="S4462" Action="None" />
354355
<Rule Id="S4487" Action="Warning" />
355356
<Rule Id="S4524" Action="Warning" />
@@ -358,13 +359,21 @@
358359
<Rule Id="S4583" Action="Warning" />
359360
<Rule Id="S4586" Action="Warning" />
360361
<Rule Id="S4635" Action="Warning" />
362+
<Rule Id="S4663" Action="Info" />
361363
<Rule Id="S4830" Action="Warning" />
362364
<Rule Id="S5034" Action="Warning" />
363365
<Rule Id="S5445" Action="Warning" />
364366
<Rule Id="S5542" Action="Warning" />
365367
<Rule Id="S5547" Action="Warning" />
366368
<Rule Id="S5659" Action="Warning" />
367369
<Rule Id="S5773" Action="Warning" />
370+
<Rule Id="S6354" Action="None" />
371+
<Rule Id="S6419" Action="Warning" />
372+
<Rule Id="S6420" Action="Warning" />
373+
<Rule Id="S6421" Action="None" />
374+
<Rule Id="S6422" Action="Warning" />
375+
<Rule Id="S6423" Action="None" />
376+
<Rule Id="S6424" Action="Warning" />
368377
<Rule Id="S818" Action="Info" />
369378
<Rule Id="S881" Action="None" />
370379
<Rule Id="S907" Action="Warning" />

0 commit comments

Comments
 (0)