From c9393f43f694d637613c0e47797e3c768de4e573 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:36:15 +0000 Subject: [PATCH 01/13] build(deps): Bump dart in /tools/build_virtual_environment/ve Bumps dart from `b42328c` to `1521c3d`. --- updated-dependencies: - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tools/build_virtual_environment/ve/Dockerfile.vip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_virtual_environment/ve/Dockerfile.vip b/tools/build_virtual_environment/ve/Dockerfile.vip index 9dd43f651..249a36ead 100644 --- a/tools/build_virtual_environment/ve/Dockerfile.vip +++ b/tools/build_virtual_environment/ve/Dockerfile.vip @@ -1,4 +1,4 @@ -FROM dart:3.1.3@sha256:b42328ca91e961fdec1346e930df42fb027d51cfba04af2a748764bbc867e1f8 AS buildimage +FROM dart:3.1.3@sha256:1521c3d4e9e077a306e6af0857f49dd9465333cd0d140677c99a73c81582a63f AS buildimage ENV USER_ID=1024 ENV GROUP_ID=1024 WORKDIR /app From 856891eda22254aa436d116569288ad60deec6d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:39:12 +0000 Subject: [PATCH 02/13] build(deps): Bump github/codeql-action from 2.22.1 to 2.22.2 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.1 to 2.22.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/fdcae64e1484d349b3366718cdfef3d404390e85...d90b8d79de6dc1f58e83a1499aa58d6c93dc28de) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2b3cc23c5..79464e219 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1 + uses: github/codeql-action/init@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.22.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -60,7 +60,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1 + uses: github/codeql-action/autobuild@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.22.2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -73,6 +73,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1 + uses: github/codeql-action/analyze@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.22.2 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 46ac156f2..10ad96cf7 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -67,6 +67,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.13.4 + uses: github/codeql-action/upload-sarif@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.13.4 with: sarif_file: results.sarif From 9a51fc56b59ac674b377c75ad531303c1536b689 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:40:14 +0000 Subject: [PATCH 03/13] build(deps): Bump dart in /tools/build_virtual_environment/ve_base Bumps dart from `b42328c` to `1521c3d`. --- updated-dependencies: - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tools/build_virtual_environment/ve_base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_virtual_environment/ve_base/Dockerfile b/tools/build_virtual_environment/ve_base/Dockerfile index a0bb6fad0..cc4144a63 100644 --- a/tools/build_virtual_environment/ve_base/Dockerfile +++ b/tools/build_virtual_environment/ve_base/Dockerfile @@ -1,4 +1,4 @@ -FROM dart:3.1.3@sha256:b42328ca91e961fdec1346e930df42fb027d51cfba04af2a748764bbc867e1f8 AS buildimage +FROM dart:3.1.3@sha256:1521c3d4e9e077a306e6af0857f49dd9465333cd0d140677c99a73c81582a63f AS buildimage ENV USER_ID=1024 ENV GROUP_ID=1024 WORKDIR /app From 6108664ac11e3045683592793661caca2d4d1773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:51:31 +0000 Subject: [PATCH 04/13] build(deps): Bump dart in /packages/at_root_server Bumps dart from `b42328c` to `1521c3d`. --- updated-dependencies: - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/at_root_server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/at_root_server/Dockerfile b/packages/at_root_server/Dockerfile index 552c24249..b24885726 100644 --- a/packages/at_root_server/Dockerfile +++ b/packages/at_root_server/Dockerfile @@ -1,4 +1,4 @@ -FROM dart:3.1.3@sha256:b42328ca91e961fdec1346e930df42fb027d51cfba04af2a748764bbc867e1f8 AS buildimage +FROM dart:3.1.3@sha256:1521c3d4e9e077a306e6af0857f49dd9465333cd0d140677c99a73c81582a63f AS buildimage ENV HOMEDIR=/atsign ENV BINARYDIR=/usr/local/at ENV USER_ID=1024 From b304e189792422565c1c34c0245affac376b514a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:56:45 +0000 Subject: [PATCH 05/13] build(deps): Bump dart in /tools/build_secondary Bumps dart from `b42328c` to `1521c3d`. --- updated-dependencies: - dependency-name: dart dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tools/build_secondary/Dockerfile | 2 +- tools/build_secondary/Dockerfile.observe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build_secondary/Dockerfile b/tools/build_secondary/Dockerfile index 21fc3bd69..643cd88c5 100644 --- a/tools/build_secondary/Dockerfile +++ b/tools/build_secondary/Dockerfile @@ -1,4 +1,4 @@ -FROM dart:3.1.3@sha256:b42328ca91e961fdec1346e930df42fb027d51cfba04af2a748764bbc867e1f8 AS buildimage +FROM dart:3.1.3@sha256:1521c3d4e9e077a306e6af0857f49dd9465333cd0d140677c99a73c81582a63f AS buildimage ENV HOMEDIR=/atsign ENV USER_ID=1024 ENV GROUP_ID=1024 diff --git a/tools/build_secondary/Dockerfile.observe b/tools/build_secondary/Dockerfile.observe index a22197187..780db6b34 100644 --- a/tools/build_secondary/Dockerfile.observe +++ b/tools/build_secondary/Dockerfile.observe @@ -1,4 +1,4 @@ -FROM dart:3.1.3@sha256:b42328ca91e961fdec1346e930df42fb027d51cfba04af2a748764bbc867e1f8 AS buildimage +FROM dart:3.1.3@sha256:1521c3d4e9e077a306e6af0857f49dd9465333cd0d140677c99a73c81582a63f AS buildimage ENV HOMEDIR=/atsign ENV USER_ID=1024 ENV GROUP_ID=1024 From 3dea8b4d63b5191d42a5a74807b098709f32dcff Mon Sep 17 00:00:00 2001 From: gkc Date: Sat, 14 Oct 2023 12:06:23 +0100 Subject: [PATCH 06/13] fix: reduce root server SEVERE log noise --- .../lib/src/server/at_root_server_impl.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/at_root_server/lib/src/server/at_root_server_impl.dart b/packages/at_root_server/lib/src/server/at_root_server_impl.dart index 895566cb1..4ab483eed 100644 --- a/packages/at_root_server/lib/src/server/at_root_server_impl.dart +++ b/packages/at_root_server/lib/src/server/at_root_server_impl.dart @@ -178,7 +178,13 @@ class RootServerImpl implements AtRootServer { serverSocket.listen((connection) { _handle(AtClientConnectionImpl(connection)); }, onError: (error) { - logger.severe('rootServer Socket Error :' + + if (error is HandShakeException) { + // This is not unusual. If there's a real cert problem + // then client-side monitoring will detect it. + // See https://github.com/atsign-foundation/at_server/issues/1590 + return; + } + logger.info('ServerSocket stream error :' + error.toString() + 'connecting to ' + serverSocket.address.toString()); From 744fa7334e7ff903ae5aef3c3b07ea89384da25b Mon Sep 17 00:00:00 2001 From: gkc Date: Sat, 14 Oct 2023 12:13:32 +0100 Subject: [PATCH 07/13] fix: Moved a sleep statement which was always causing an unnecessary 10-second delay during server startup. --- .../at_root_server/lib/src/server/at_root_server_impl.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/at_root_server/lib/src/server/at_root_server_impl.dart b/packages/at_root_server/lib/src/server/at_root_server_impl.dart index 4ab483eed..bf603c51d 100644 --- a/packages/at_root_server/lib/src/server/at_root_server_impl.dart +++ b/packages/at_root_server/lib/src/server/at_root_server_impl.dart @@ -130,6 +130,9 @@ class RootServerImpl implements AtRootServer { var certsAvailable = false; // if certs are unavailable then retry max 10 minutes while (true) { + if (retryCount > 0) { + sleep(Duration(seconds: 10)); + } try { if (certsAvailable || retryCount > 60) { break; @@ -142,7 +145,6 @@ class RootServerImpl implements AtRootServer { retryCount++; logger.info('certs unavailable. Retry count ${retryCount}'); } - sleep(Duration(seconds: 10)); } if (certsAvailable) { SecureServerSocket.bind(InternetAddress.anyIPv4, port!, secCon) From d84f8aaca4ee25c47b638f6a91a5f96b452c5a1c Mon Sep 17 00:00:00 2001 From: gkc Date: Sat, 14 Oct 2023 12:19:30 +0100 Subject: [PATCH 08/13] fix: typo in exception class name --- .../at_root_server/lib/src/server/at_root_server_impl.dart | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/at_root_server/lib/src/server/at_root_server_impl.dart b/packages/at_root_server/lib/src/server/at_root_server_impl.dart index bf603c51d..309d1e81b 100644 --- a/packages/at_root_server/lib/src/server/at_root_server_impl.dart +++ b/packages/at_root_server/lib/src/server/at_root_server_impl.dart @@ -180,13 +180,12 @@ class RootServerImpl implements AtRootServer { serverSocket.listen((connection) { _handle(AtClientConnectionImpl(connection)); }, onError: (error) { - if (error is HandShakeException) { - // This is not unusual. If there's a real cert problem - // then client-side monitoring will detect it. + if (error is HandshakeException) { + // This is not unusual. // See https://github.com/atsign-foundation/at_server/issues/1590 return; } - logger.info('ServerSocket stream error :' + + logger.warning('ServerSocket stream error :' + error.toString() + 'connecting to ' + serverSocket.address.toString()); From 21dd65a5af7d275a874b6bb6b6808b2fd4fce0a8 Mon Sep 17 00:00:00 2001 From: gkc Date: Sat, 14 Oct 2023 13:19:22 +0100 Subject: [PATCH 09/13] feat: Add rate limiting for clients which are looking up non-existent atSigns fix: prevent multiple calls to socket.destroy() fix: prevent duplicate log messages upon client socket disconnect --- .../lib/src/client/at_root_client.dart | 47 +++++++++++++++---- .../lib/src/server/at_root_server_impl.dart | 2 +- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/packages/at_root_server/lib/src/client/at_root_client.dart b/packages/at_root_server/lib/src/client/at_root_client.dart index 703c4cc3e..a39d94deb 100644 --- a/packages/at_root_server/lib/src/client/at_root_client.dart +++ b/packages/at_root_server/lib/src/client/at_root_client.dart @@ -5,6 +5,8 @@ import 'package:at_persistence_root_server/at_persistence_root_server.dart'; import 'package:at_utils/at_logger.dart'; import 'package:at_commons/at_commons.dart'; +enum RootClientState {listening,closing,closed} + /// Represents Root Server client instance which contains socket on which a connection got established class RootClient { late Socket _socket; @@ -12,6 +14,8 @@ class RootClient { int? _port; static final _keyStoreManager = KeystoreManagerImpl(); final _buffer = StringBuffer(capacity: 255); + int notFoundCount = 0; + late RootClientState state; RootClient(Socket s) { _socket = s; @@ -20,6 +24,7 @@ class RootClient { RootClientPool().add(this); _socket.listen(_messageHandler, onError: _errorHandler, onDone: _finishedHandler); + state = RootClientState.listening; } var logger = AtSignLogger('RootClient'); @@ -29,26 +34,43 @@ class RootClient { /// @param - data : data received from client over the socket Future _messageHandler(data) async { try { - logger.info('In root client _messagehandler'); + logger.finest('${_address}:${_port} In root client _messagehandler'); var message = utf8.decode(data); message = message.toLowerCase(); _buffer.append(message); - if (_buffer.getData()!.trim() == '@exit') { + var lookupPayload = _buffer.getData()!.trim(); + if (lookupPayload == '@exit') { _finishedHandler(); return; } else { if (_buffer.isEnd()) { var result = await _keyStoreManager .getKeyStore() - .get(_buffer.getData()!.trim()); - logger.finer('result:${result}'); + .get(lookupPayload); + logger.info('${_address}:${_port} Looked up: $lookupPayload | Found: $result'); + + if (result == null) { + notFoundCount++; + if (notFoundCount > 1) { + // If we've already had at least one lookup of a non-existent atSign + // then we will wait a few seconds before responding + await Future.delayed(Duration(seconds: 3)); + } + + if (notFoundCount > 2) { + // And if we've already had at least two lookups of a non-existent + // atSign then we will terminate the connection + _finishedHandler(); + return; + } + } result ??= 'null'; write(result + '\r\n@'); _buffer.clear(); } } } on Exception catch (exception) { - logger.severe(exception); + logger.severe('${_address}:${_port} _messageHandler | $exception'); _socket.destroy(); } catch (error) { _errorHandler(error.toString()); @@ -59,16 +81,19 @@ class RootClient { /// Return type - void /// @param - error : error string void _errorHandler(error) { - logger.severe('${_address}:${_port} Error: $error'); - removeClient(this); - _socket.destroy(); + if (state == RootClientState.listening) { + logger.severe('${_address}:${_port} Error: $error'); + removeClient(this); + } } /// _finishedHandler close the client connection and remove from client pool /// Return type - void void _finishedHandler() { - logger.info('${_address}:${_port} Disconnected'); - removeClient(this); + if (state == RootClientState.listening) { + logger.info('${_address}:${_port} Disconnected'); + removeClient(this); + } } /// write - Writes received message to the client socket @@ -83,7 +108,9 @@ class RootClient { /// return type - void /// @param - rootClient - Instance of RootClient void removeClient(RootClient rootClient) { + state = RootClientState.closing; rootClient._socket.destroy(); RootClientPool().remove(rootClient); + state = RootClientState.closed; } } diff --git a/packages/at_root_server/lib/src/server/at_root_server_impl.dart b/packages/at_root_server/lib/src/server/at_root_server_impl.dart index 309d1e81b..8b1a95b2b 100644 --- a/packages/at_root_server/lib/src/server/at_root_server_impl.dart +++ b/packages/at_root_server/lib/src/server/at_root_server_impl.dart @@ -85,7 +85,7 @@ class RootServerImpl implements AtRootServer { logger.info('Connection from ' '${socket.remoteAddress.address}:${socket.remotePort}'); var client = RootClient(socket); - logger.info('connection successful\n'); + logger.info('connection successful'); client.write('@'); } From d8cac13226413db62f04e96851fc69543fffacf5 Mon Sep 17 00:00:00 2001 From: gkc Date: Sat, 14 Oct 2023 13:38:21 +0100 Subject: [PATCH 10/13] build: at_root_server: update and pin dependencies build: at_root_server: update version to 2.1.0 and update CHANGELOG --- packages/at_root_server/CHANGELOG.md | 4 ++++ packages/at_root_server/pubspec.yaml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/at_root_server/CHANGELOG.md b/packages/at_root_server/CHANGELOG.md index 60a30e978..15b325343 100644 --- a/packages/at_root_server/CHANGELOG.md +++ b/packages/at_root_server/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.0 +- feat: rate limiting when looking up non-existent atSigns +- feat: miscellaneous logging enhancements +- fix: removed unnecessary 10-second delay during normal startup ## 2.0.5 - upgrade persistence spec version ## 2.0.4 diff --git a/packages/at_root_server/pubspec.yaml b/packages/at_root_server/pubspec.yaml index c59112999..5166ea9d2 100644 --- a/packages/at_root_server/pubspec.yaml +++ b/packages/at_root_server/pubspec.yaml @@ -1,6 +1,6 @@ name: at_root_server description: Root server implementation. -version: 2.0.5 +version: 2.1.0 repository: https://github.com/atsign-foundation/at_server homepage: https://atsign.dev publish_to: none @@ -9,12 +9,12 @@ environment: sdk: '>=2.15.0 <4.0.0' dependencies: - args: ^2.1.0 - uuid: ^3.0.4 - yaml: ^3.1.0 - at_commons: 3.0.53 + args: 2.4.2 + uuid: 3.0.6 + yaml: 3.1.2 + at_commons: 3.0.56 at_utils: 3.0.15 - at_server_spec: 3.0.13 + at_server_spec: 3.0.15 at_persistence_root_server: git: url: https://github.com/atsign-foundation/at_server.git @@ -25,6 +25,6 @@ dependencies: dev_dependencies: # Adding test_cov for generating the test coverage. test_cov: ^1.0.1 - lints: ^1.0.1 + lints: ^2.1.1 test: ^1.24.6 - coverage: ^1.0.3 + coverage: ^1.6.3 From 695d3f19e30f8ece09b586410383f8a9897a1843 Mon Sep 17 00:00:00 2001 From: "library-action[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 15 Oct 2023 07:41:04 +0000 Subject: [PATCH 11/13] chore: New certificates for at_server --- .../contents/atsign/root/certs/cert.pem | 42 +++++++-------- .../contents/atsign/root/certs/fullchain.pem | 42 +++++++-------- .../contents/atsign/root/certs/privkey.pem | 52 +++++++++---------- .../atsign/secondary/base/certs/cert.pem | 42 +++++++-------- .../atsign/secondary/base/certs/fullchain.pem | 42 +++++++-------- .../atsign/secondary/base/certs/privkey.pem | 52 +++++++++---------- 6 files changed, 136 insertions(+), 136 deletions(-) diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/cert.pem b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/cert.pem index 15713123b..421348def 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/cert.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/cert.pem @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- -MIIE7zCCA9egAwIBAgISBGV0x7YpXVnB6SwdaieWKPn9MA0GCSqGSIb3DQEBCwUA +MIIE8TCCA9mgAwIBAgISA1Wp1SUaqN8j6PDG4XRAszPmMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMzA5MTUwNjQwNThaFw0yMzEyMTQwNjQwNTdaMB0xGzAZBgNVBAMT +EwJSMzAeFw0yMzEwMTUwNjQxMDNaFw0yNDAxMTMwNjQxMDJaMB0xGzAZBgNVBAMT EnZpcC52ZS5hdHNpZ24uem9uZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAJ+aXqSgNbL999OQJv2BZtAi3tJdmLnwoS8+M9OUKxdb7PYyRm+wi5qageAm -fLX7tWOhwGl9m2OODcDkGevGRRs5zkEGjUvRkFZ+Xe3rU3Q7VHZ87eKfMaI4iNYO -iqZ6JDqWXpG0lcbJDQMbZHOb5VC028WZ96qnwr8efFar2gWqlH2oqZgJDJMnlV5M -fthYtoh3ubEdzwxPfuklFAHvYdWrMioqczJaFNRG4+WqISm+0CE67eyDkEoDAYdQ -Sp0ElDAilO4w2XR1PRkGXPewt7cTCM3eNCq16YClAyezMNYtQUIOsk7LmPmY+Mjb -er0MH0Krz5JJ6uFieZkwW0kkhiMCAwEAAaOCAhIwggIOMA4GA1UdDwEB/wQEAwIF +ggEBAJmIE7SqmB+Cb3Q8fD9Xf4Rwi5y4M4trRfuCyzM1DBdzztjQ91hfD5mYl+qR +YZKVkfgXeFTwTqgzKPyhpR6GO6BW9he71Wb+oZ7/2vDNotqjA3GgNnegX2WmriPj +FHaLuIy0HPmuyiqcaFvkKAUDBqfIRnPVAQPcq5K7GtzZC8mvEEXx+4gHgZgPXp2B +XxcHx9vowi9Tglawduw5g2uAV4XL/R4OUH60xMg1yv4h604Hkmkzm8t6SF7lFdCT +rw36zZ13hfoYZ2+KWFkvvsS2qr8ota2C2eaw27Hbk5b6iNyhGOwgvotQHZnN/+5p +5LKNhCwwaO3a3P4XSu3B7binHaMCAwEAAaOCAhQwggIQMA4GA1UdDwEB/wQEAwIF oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd -BgNVHQ4EFgQUM3/XpmXPFwMnRLKZM4IVsuSEWK4wHwYDVR0jBBgwFoAUFC6zF7dY +BgNVHQ4EFgQUQfo8vxTR6nrRHXKQbvPXP60GHP8wHwYDVR0jBBgwFoAUFC6zF7dY VsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRw Oi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNy Lm9yZy8wHQYDVR0RBBYwFIISdmlwLnZlLmF0c2lnbi56b25lMBMGA1UdIAQMMAow -CAYGZ4EMAQIBMIIBAgYKKwYBBAHWeQIEAgSB8wSB8ADuAHUAejKMVNi3LbYg6jjg -Uh7phBZwMhOFTTvSK8E6V6NS61IAAAGKl8kvTwAABAMARjBEAiAbGsoGBPZ19N17 -o4DH8yUjR5Swag2E6irKpvBBkgAu6AIgCGK1KQhxvi/EYN70wTS+Xs1d74wQJCgB -q+zcRTdWy4YAdQC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmBJe20mQAAAYqX -yS9AAAAEAwBGMEQCIAGQSATyKTRLdsZGBtgMptmaUJL/Lm+zTquSMH9xGko+AiBi -TajqzjxBP8jyDnOOR/pOHGw75nTmSQB92nQQDbrfjDANBgkqhkiG9w0BAQsFAAOC -AQEAg/WrbG4dN4HkeOGz4DwbYZmcN5RKGZpMBrAwyGu/TLBtlcYzGU6nNtm09d5M -MIelGcRgR9lXEslcpvwFwkDw1/J01c3PTr/iwyGBV9bIB0WAn2o1b5+qVnkmcxO6 -1V/9ebmL/NXDhewNkycAgI+Yl8rBIxMsxuX2byygMK2yZJhiKFu7n2ieJPWaH66d -rYRJhsLJGwFJ2ZACYHr7S85bmV8iJ2mwBTWZfrp/QDsjvsV5I5yGZ3MzORBlr5sJ -y13ZVc9dUyRHifIeVNxHmCIIYrlMvhpo99yvbvwZzrG00nYc2QnQluCJ2QBpjLXs -zKZZcvGXtZETY04PlgVsaEhyQQ== +CAYGZ4EMAQIBMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUA2ra/az+1tiKfm8K7 +XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGLMkgHnAAABAMARjBEAiBJCtlj5ouGTrqr +m8I1FnZCPJnk4uOG9Wfm1rvvQSvDgQIgQqdGTCznBiv6fLVcgDjMVRb6IFjP5vtM +kJrpW8YiDAwAdwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYsy +SAeJAAAEAwBIMEYCIQCo5oE4c2AxnViVSVEiwn2oCu5yyxnKkW77C+9m37imagIh +AIh/FMzYY6xUTMtDOyUYC4h+MmuGzMI3KPV92Ehhq2PmMA0GCSqGSIb3DQEBCwUA +A4IBAQBROIAX48fzNSii3UxUTgGb6dQNe2B8MEJayN+/NOba3g7H68BgNBgaIF9+ +IoC6JzCC3RcfebGPwEtRKveJNDT52pp2/GykUk0U+twnD8eCSvtjR3um55+ZO2O8 +5bnNNwwAyZrVaR+3tfk3f6p7d1IdHuFcNHWIELqc3dW190mnOoPQIpp5pLv9PHBa +irZhXTrNmBJ+OL+QM57cA7tpKLr8JjqKo09s+MNvk6j6op1H/71/UlOKnBxWi/Fn +DznnWQX5MwJQ28lX9yOybbVwV58xdsL2nnuQXH488jBaCimiSVkCLbQE/9X6sNfr +MD97yFyDD9QETsvZC1TPxyIuHH9K -----END CERTIFICATE----- diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/fullchain.pem b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/fullchain.pem index 9859bcb8b..ecdbeadb9 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/fullchain.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/fullchain.pem @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -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 -zKZZcvGXtZETY04PlgVsaEhyQQ== +CAYGZ4EMAQIBMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUA2ra/az+1tiKfm8K7 +XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGLMkgHnAAABAMARjBEAiBJCtlj5ouGTrqr +m8I1FnZCPJnk4uOG9Wfm1rvvQSvDgQIgQqdGTCznBiv6fLVcgDjMVRb6IFjP5vtM +kJrpW8YiDAwAdwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYsy +SAeJAAAEAwBIMEYCIQCo5oE4c2AxnViVSVEiwn2oCu5yyxnKkW77C+9m37imagIh +AIh/FMzYY6xUTMtDOyUYC4h+MmuGzMI3KPV92Ehhq2PmMA0GCSqGSIb3DQEBCwUA +A4IBAQBROIAX48fzNSii3UxUTgGb6dQNe2B8MEJayN+/NOba3g7H68BgNBgaIF9+ +IoC6JzCC3RcfebGPwEtRKveJNDT52pp2/GykUk0U+twnD8eCSvtjR3um55+ZO2O8 +5bnNNwwAyZrVaR+3tfk3f6p7d1IdHuFcNHWIELqc3dW190mnOoPQIpp5pLv9PHBa +irZhXTrNmBJ+OL+QM57cA7tpKLr8JjqKo09s+MNvk6j6op1H/71/UlOKnBxWi/Fn +DznnWQX5MwJQ28lX9yOybbVwV58xdsL2nnuQXH488jBaCimiSVkCLbQE/9X6sNfr +MD97yFyDD9QETsvZC1TPxyIuHH9K -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/privkey.pem b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/privkey.pem index c32592d03..891eca1f0 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/privkey.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/root/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCfml6koDWy/ffT -kCb9gWbQIt7SXZi58KEvPjPTlCsXW+z2MkZvsIuamoHgJny1+7VjocBpfZtjjg3A -5BnrxkUbOc5BBo1L0ZBWfl3t61N0O1R2fO3inzGiOIjWDoqmeiQ6ll6RtJXGyQ0D -G2Rzm+VQtNvFmfeqp8K/HnxWq9oFqpR9qKmYCQyTJ5VeTH7YWLaId7mxHc8MT37p -JRQB72HVqzIqKnMyWhTURuPlqiEpvtAhOu3sg5BKAwGHUEqdBJQwIpTuMNl0dT0Z -Blz3sLe3EwjN3jQqtemApQMnszDWLUFCDrJOy5j5mPjI23q9DB9Cq8+SSerhYnmZ -MFtJJIYjAgMBAAECggEAC0d2C81Uri8bjgSAdObptKjaNWSu7+kNAxEyyW+Nsgtp -jiaUar0/yG/F4OjnZFcDBST/u5TIX/tAhpK4MDzlUly98kN7xdFsEWjBy5gXYD33 -JJ6Ek0Dr2YqERRhm/QfhupA447Qu54r60+7iJPdt98uoQmk0owdTEH2fjOJ9OGwu -dhkXEA6R1JkPP4odpgNjKvEZ0OzVbKsajfrYkKqnVF3G7gUFGjRyeZde5QbbGghk -vPsjGA8FbMcWXB6en7kaPOwSbbp7GalyvGfjjiQMC0aS2TPkJ/QZdwWxvvuy3N8O -hp7FKIo1rlu2HvSn9qxR5j5XLFXXqN2GQQ+TsAmi+QKBgQC2vd1y63+SbgrEHcRl -Id8UuRK2H1lJGJM8cCH+v+zu6xd7w8PvV0m5ZEMHkDhFmxICknfLDXi2IYnWTm1u -7xL1vHMNn032+0zgxp9rHXI+YaU4hql+rf9EQYVV8gDw1P0m+UNRuTib0bsZJ0DH -0G7RK4E4BHYYJBa3GWKyvAs0aQKBgQDfld2qhPs8j5NjTqldY2WV2lLs2bnH5Loe -ikpiMrbcw6iP25xtg0JJeLOapYzS9+qVfU17aKrez+yZrNn5JibLXEKXpw2Cl9wI -iPpcnKncSIsvRz93rBGhZfjqONmV84otQtYOrd/OnI4rilit0iZ9gwUJxG/cbbER -3hT5r8PkqwKBgCPMEaM/aqAemlFMm3pMJk0C7B1tCqp8++qs9JvYsOskdlcyRCGQ -ccq1T0QeBkfsVpzWYE0QeIMFEuE+P8WpY4drwQX8HOOy2p51iikLfaOmsRzflDhS -kVynkR0C6RhEQMrvrTZHGEW90e7dd50swWiMIyX8Cb4045Y+jM0CdRdxAoGAcC7u -+OcedAWKK1LFsgD0cJsJ7qNUDxMZu8chiWHu1JgrlHrZYy1v7hNs8pRMM3KHNpiX -butWiNOE4JqVB+j3oCPbmeIM6lCt625nSF6m78tKYt953d7tPbE/kq4RpqZ61zjo -1JazbCSrRPd2hUijXWiG956jjdNP/CoVFi71uF8CgYBzRhDTelW+USb/pgIFJKr0 -5fUDPgPF5M+EhfeGPDIcotIu/gHlDpFuxHR8ViTptfYF7L2p1C3TvJigCanNPwpH -lhatYkS/wdRBJDZCNPbKCKp843Ymec+yIrlHa2ZHXTe28vO+FHA2wzG74Yoyn/+c -1anN4xF+E2BOtK3RKQfxzA== +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCZiBO0qpgfgm90 +PHw/V3+EcIucuDOLa0X7gsszNQwXc87Y0PdYXw+ZmJfqkWGSlZH4F3hU8E6oMyj8 +oaUehjugVvYXu9Vm/qGe/9rwzaLaowNxoDZ3oF9lpq4j4xR2i7iMtBz5rsoqnGhb +5CgFAwanyEZz1QED3KuSuxrc2QvJrxBF8fuIB4GYD16dgV8XB8fb6MIvU4JWsHbs +OYNrgFeFy/0eDlB+tMTINcr+IetOB5JpM5vLekhe5RXQk68N+s2dd4X6GGdvilhZ +L77Etqq/KLWtgtnmsNux25OW+ojcoRjsIL6LUB2Zzf/uaeSyjYQsMGjt2tz+F0rt +we24px2jAgMBAAECggEACNtawlSyYI72aFmHlA0zeVZswhELmC1guiOkyULJfHOH +0+YqKVpCh3UlaQ4TTOYn/OHjD93/tkr36wBVitnqMqkRmp48BKxdHSkGs6wz4DJV +49t+3jki3QsCh2YgK2k1WkNBsKhZV/VHPUB/i9p4KycDOXITlD90qQr2Kmtdog11 +FvEdnwLZ5eFIZY7pat20JL0WVh8ti14b98zg44Hfgq5+WIQfTZf5wO70rxb0thZ8 +dn8/weUeZouKNWkzjvhOrWzv5IBWFbgFeBDReJbuhZ081d5TffK9xGPUaOuWIu1v +pGYJq1XhN6ce+ahYIQmCueJ/ninRiqkVMtxqWGr4kQKBgQDQmfzdZi6Cv95WZLJp +a3pgtb0Zoibej3PoK0jfrfu78mW68AIOlOAM7crphA9lhXEIkTTgXgJRpQeZAvJb +nLWZrKF+VtfO5WdSIE2RQFC4q2HBk0ka0giLjBk3xXkqYF/L7RyCozQK+BP1DINj +PJ49HWh5MTrPBnqGromHS/utjwKBgQC8asI0YOySF9odeNJHe32UfJ/TfWhXC49N +fAqMsRj3LScUm8Ga3L5TqrMWsjVLnXyW9WbnDCxr2NYrKtfWQJI9KvW4c5yw3gxr +BK4R+b1yG6Xsn8/ujSuyB2fuKbaFF5KEiC3wyatcbONCfV7HPzOvA/RMrzYJPXMn +vl29t73srQKBgQCUUpmotwolL9YgqdLuAFzwvOirfE+U+n1YvMZBPY178vwAsr1T +rumsZ7xa0+q6repURCNL0axmbyh61MyM9V1u2n+tvIQQea9AhvWAbTG4TSviHx7g +8izfRIt9y2y/A+25q2wVO4Q6tHBEUlRt0GFXZTyux6FgKOQgNaRWTmGy4wKBgCWD ++EEnn1MDbsl5eh0DiKCdI9GfYbwbMCBUd2FGDduBYQuoa6cjFr5f+aKmPxhcNid0 +m1Wbxeh/Vz1nHWyqlLObLyvX0TYiMETKvMIVgNQMj0ALHgK4lx+ue9Ie+hmL9P9w +gf00mmsfvyxI/Csd+XN6jRULue2jD5+1NsMEp8tNAoGAX1eSxoDgNjDG6r8ECIva +VClNh7boSxpfC19LHvSn1Wr6rD0/KdBxQ/i4KdKpX2Lozj/qWnhh76+RaJuo0QPg +BhzvK5Z3YguK8s/tFbZ3+P0S7ooCCvImEyAh1gRutalsUkGaeBFi7muet6Q8u07+ +QLbucwF1hh3IHniovRAWYIQ= -----END PRIVATE KEY----- diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/cert.pem b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/cert.pem index 15713123b..421348def 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/cert.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/cert.pem @@ -1,29 +1,29 @@ -----BEGIN CERTIFICATE----- -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 -zKZZcvGXtZETY04PlgVsaEhyQQ== +CAYGZ4EMAQIBMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUA2ra/az+1tiKfm8K7 +XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGLMkgHnAAABAMARjBEAiBJCtlj5ouGTrqr +m8I1FnZCPJnk4uOG9Wfm1rvvQSvDgQIgQqdGTCznBiv6fLVcgDjMVRb6IFjP5vtM +kJrpW8YiDAwAdwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYsy +SAeJAAAEAwBIMEYCIQCo5oE4c2AxnViVSVEiwn2oCu5yyxnKkW77C+9m37imagIh +AIh/FMzYY6xUTMtDOyUYC4h+MmuGzMI3KPV92Ehhq2PmMA0GCSqGSIb3DQEBCwUA +A4IBAQBROIAX48fzNSii3UxUTgGb6dQNe2B8MEJayN+/NOba3g7H68BgNBgaIF9+ +IoC6JzCC3RcfebGPwEtRKveJNDT52pp2/GykUk0U+twnD8eCSvtjR3um55+ZO2O8 +5bnNNwwAyZrVaR+3tfk3f6p7d1IdHuFcNHWIELqc3dW190mnOoPQIpp5pLv9PHBa +irZhXTrNmBJ+OL+QM57cA7tpKLr8JjqKo09s+MNvk6j6op1H/71/UlOKnBxWi/Fn +DznnWQX5MwJQ28lX9yOybbVwV58xdsL2nnuQXH488jBaCimiSVkCLbQE/9X6sNfr +MD97yFyDD9QETsvZC1TPxyIuHH9K -----END CERTIFICATE----- diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/fullchain.pem b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/fullchain.pem index 9859bcb8b..ecdbeadb9 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/fullchain.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/fullchain.pem @@ -1,31 +1,31 @@ -----BEGIN CERTIFICATE----- -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 -zKZZcvGXtZETY04PlgVsaEhyQQ== +CAYGZ4EMAQIBMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUA2ra/az+1tiKfm8K7 +XGvocJFxbLtRhIU0vaQ9MEjX+6sAAAGLMkgHnAAABAMARjBEAiBJCtlj5ouGTrqr +m8I1FnZCPJnk4uOG9Wfm1rvvQSvDgQIgQqdGTCznBiv6fLVcgDjMVRb6IFjP5vtM +kJrpW8YiDAwAdwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYsy +SAeJAAAEAwBIMEYCIQCo5oE4c2AxnViVSVEiwn2oCu5yyxnKkW77C+9m37imagIh +AIh/FMzYY6xUTMtDOyUYC4h+MmuGzMI3KPV92Ehhq2PmMA0GCSqGSIb3DQEBCwUA +A4IBAQBROIAX48fzNSii3UxUTgGb6dQNe2B8MEJayN+/NOba3g7H68BgNBgaIF9+ +IoC6JzCC3RcfebGPwEtRKveJNDT52pp2/GykUk0U+twnD8eCSvtjR3um55+ZO2O8 +5bnNNwwAyZrVaR+3tfk3f6p7d1IdHuFcNHWIELqc3dW190mnOoPQIpp5pLv9PHBa +irZhXTrNmBJ+OL+QM57cA7tpKLr8JjqKo09s+MNvk6j6op1H/71/UlOKnBxWi/Fn +DznnWQX5MwJQ28lX9yOybbVwV58xdsL2nnuQXH488jBaCimiSVkCLbQE/9X6sNfr +MD97yFyDD9QETsvZC1TPxyIuHH9K -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- diff --git a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/privkey.pem b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/privkey.pem index c32592d03..891eca1f0 100644 --- a/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/privkey.pem +++ b/tools/build_virtual_environment/ve_base/contents/atsign/secondary/base/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCfml6koDWy/ffT -kCb9gWbQIt7SXZi58KEvPjPTlCsXW+z2MkZvsIuamoHgJny1+7VjocBpfZtjjg3A -5BnrxkUbOc5BBo1L0ZBWfl3t61N0O1R2fO3inzGiOIjWDoqmeiQ6ll6RtJXGyQ0D -G2Rzm+VQtNvFmfeqp8K/HnxWq9oFqpR9qKmYCQyTJ5VeTH7YWLaId7mxHc8MT37p -JRQB72HVqzIqKnMyWhTURuPlqiEpvtAhOu3sg5BKAwGHUEqdBJQwIpTuMNl0dT0Z -Blz3sLe3EwjN3jQqtemApQMnszDWLUFCDrJOy5j5mPjI23q9DB9Cq8+SSerhYnmZ -MFtJJIYjAgMBAAECggEAC0d2C81Uri8bjgSAdObptKjaNWSu7+kNAxEyyW+Nsgtp -jiaUar0/yG/F4OjnZFcDBST/u5TIX/tAhpK4MDzlUly98kN7xdFsEWjBy5gXYD33 -JJ6Ek0Dr2YqERRhm/QfhupA447Qu54r60+7iJPdt98uoQmk0owdTEH2fjOJ9OGwu -dhkXEA6R1JkPP4odpgNjKvEZ0OzVbKsajfrYkKqnVF3G7gUFGjRyeZde5QbbGghk -vPsjGA8FbMcWXB6en7kaPOwSbbp7GalyvGfjjiQMC0aS2TPkJ/QZdwWxvvuy3N8O -hp7FKIo1rlu2HvSn9qxR5j5XLFXXqN2GQQ+TsAmi+QKBgQC2vd1y63+SbgrEHcRl -Id8UuRK2H1lJGJM8cCH+v+zu6xd7w8PvV0m5ZEMHkDhFmxICknfLDXi2IYnWTm1u -7xL1vHMNn032+0zgxp9rHXI+YaU4hql+rf9EQYVV8gDw1P0m+UNRuTib0bsZJ0DH -0G7RK4E4BHYYJBa3GWKyvAs0aQKBgQDfld2qhPs8j5NjTqldY2WV2lLs2bnH5Loe -ikpiMrbcw6iP25xtg0JJeLOapYzS9+qVfU17aKrez+yZrNn5JibLXEKXpw2Cl9wI -iPpcnKncSIsvRz93rBGhZfjqONmV84otQtYOrd/OnI4rilit0iZ9gwUJxG/cbbER -3hT5r8PkqwKBgCPMEaM/aqAemlFMm3pMJk0C7B1tCqp8++qs9JvYsOskdlcyRCGQ -ccq1T0QeBkfsVpzWYE0QeIMFEuE+P8WpY4drwQX8HOOy2p51iikLfaOmsRzflDhS -kVynkR0C6RhEQMrvrTZHGEW90e7dd50swWiMIyX8Cb4045Y+jM0CdRdxAoGAcC7u -+OcedAWKK1LFsgD0cJsJ7qNUDxMZu8chiWHu1JgrlHrZYy1v7hNs8pRMM3KHNpiX -butWiNOE4JqVB+j3oCPbmeIM6lCt625nSF6m78tKYt953d7tPbE/kq4RpqZ61zjo -1JazbCSrRPd2hUijXWiG956jjdNP/CoVFi71uF8CgYBzRhDTelW+USb/pgIFJKr0 -5fUDPgPF5M+EhfeGPDIcotIu/gHlDpFuxHR8ViTptfYF7L2p1C3TvJigCanNPwpH -lhatYkS/wdRBJDZCNPbKCKp843Ymec+yIrlHa2ZHXTe28vO+FHA2wzG74Yoyn/+c -1anN4xF+E2BOtK3RKQfxzA== +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCZiBO0qpgfgm90 +PHw/V3+EcIucuDOLa0X7gsszNQwXc87Y0PdYXw+ZmJfqkWGSlZH4F3hU8E6oMyj8 +oaUehjugVvYXu9Vm/qGe/9rwzaLaowNxoDZ3oF9lpq4j4xR2i7iMtBz5rsoqnGhb +5CgFAwanyEZz1QED3KuSuxrc2QvJrxBF8fuIB4GYD16dgV8XB8fb6MIvU4JWsHbs +OYNrgFeFy/0eDlB+tMTINcr+IetOB5JpM5vLekhe5RXQk68N+s2dd4X6GGdvilhZ +L77Etqq/KLWtgtnmsNux25OW+ojcoRjsIL6LUB2Zzf/uaeSyjYQsMGjt2tz+F0rt +we24px2jAgMBAAECggEACNtawlSyYI72aFmHlA0zeVZswhELmC1guiOkyULJfHOH +0+YqKVpCh3UlaQ4TTOYn/OHjD93/tkr36wBVitnqMqkRmp48BKxdHSkGs6wz4DJV +49t+3jki3QsCh2YgK2k1WkNBsKhZV/VHPUB/i9p4KycDOXITlD90qQr2Kmtdog11 +FvEdnwLZ5eFIZY7pat20JL0WVh8ti14b98zg44Hfgq5+WIQfTZf5wO70rxb0thZ8 +dn8/weUeZouKNWkzjvhOrWzv5IBWFbgFeBDReJbuhZ081d5TffK9xGPUaOuWIu1v +pGYJq1XhN6ce+ahYIQmCueJ/ninRiqkVMtxqWGr4kQKBgQDQmfzdZi6Cv95WZLJp +a3pgtb0Zoibej3PoK0jfrfu78mW68AIOlOAM7crphA9lhXEIkTTgXgJRpQeZAvJb +nLWZrKF+VtfO5WdSIE2RQFC4q2HBk0ka0giLjBk3xXkqYF/L7RyCozQK+BP1DINj +PJ49HWh5MTrPBnqGromHS/utjwKBgQC8asI0YOySF9odeNJHe32UfJ/TfWhXC49N +fAqMsRj3LScUm8Ga3L5TqrMWsjVLnXyW9WbnDCxr2NYrKtfWQJI9KvW4c5yw3gxr +BK4R+b1yG6Xsn8/ujSuyB2fuKbaFF5KEiC3wyatcbONCfV7HPzOvA/RMrzYJPXMn +vl29t73srQKBgQCUUpmotwolL9YgqdLuAFzwvOirfE+U+n1YvMZBPY178vwAsr1T +rumsZ7xa0+q6repURCNL0axmbyh61MyM9V1u2n+tvIQQea9AhvWAbTG4TSviHx7g +8izfRIt9y2y/A+25q2wVO4Q6tHBEUlRt0GFXZTyux6FgKOQgNaRWTmGy4wKBgCWD ++EEnn1MDbsl5eh0DiKCdI9GfYbwbMCBUd2FGDduBYQuoa6cjFr5f+aKmPxhcNid0 +m1Wbxeh/Vz1nHWyqlLObLyvX0TYiMETKvMIVgNQMj0ALHgK4lx+ue9Ie+hmL9P9w +gf00mmsfvyxI/Csd+XN6jRULue2jD5+1NsMEp8tNAoGAX1eSxoDgNjDG6r8ECIva +VClNh7boSxpfC19LHvSn1Wr6rD0/KdBxQ/i4KdKpX2Lozj/qWnhh76+RaJuo0QPg +BhzvK5Z3YguK8s/tFbZ3+P0S7ooCCvImEyAh1gRutalsUkGaeBFi7muet6Q8u07+ +QLbucwF1hh3IHniovRAWYIQ= -----END PRIVATE KEY----- From a12e2b3d9e6db78d09736cb5dc65b0f28effa1b6 Mon Sep 17 00:00:00 2001 From: Sitaram Kalluri Date: Wed, 20 Sep 2023 12:13:07 +0530 Subject: [PATCH 12/13] feat: Return latestCommitId among enrolled namespaces --- .../CHANGELOG.md | 2 + .../lib/src/log/commitlog/at_commit_log.dart | 4 +- .../log/commitlog/commit_log_keystore.dart | 38 +++++++++++++++---- .../pubspec.yaml | 2 +- .../test/commit_log_test.dart | 4 +- 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/packages/at_persistence_secondary_server/CHANGELOG.md b/packages/at_persistence_secondary_server/CHANGELOG.md index 22c5b964e..0d11431a9 100644 --- a/packages/at_persistence_secondary_server/CHANGELOG.md +++ b/packages/at_persistence_secondary_server/CHANGELOG.md @@ -1,3 +1,5 @@ +## 3.0.58 +- fix: Modify "lastCommittedSequenceNumberWithRegex" to return highest commitId among enrolled namespaces ## 3.0.57 - fix: Refactor commit log keystore to optimize memory usage ## 3.0.56 diff --git a/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart b/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart index fcc57a79d..63ca99d91 100644 --- a/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart +++ b/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart @@ -87,8 +87,8 @@ class AtCommitLog extends BaseAtCommitLog { /// Returns the latest committed sequence number with regex @server - Future lastCommittedSequenceNumberWithRegex(String regex) async { - return await _commitLogKeyStore.lastCommittedSequenceNumberWithRegex(regex); + Future lastCommittedSequenceNumberWithRegex(String regex,{List? enrolledNamespace}) async { + return await _commitLogKeyStore.lastCommittedSequenceNumberWithRegex(regex, enrolledNamespace: enrolledNamespace); } /// Returns the first committed sequence number diff --git a/packages/at_persistence_secondary_server/lib/src/log/commitlog/commit_log_keystore.dart b/packages/at_persistence_secondary_server/lib/src/log/commitlog/commit_log_keystore.dart index 477dbb888..e32a530d0 100644 --- a/packages/at_persistence_secondary_server/lib/src/log/commitlog/commit_log_keystore.dart +++ b/packages/at_persistence_secondary_server/lib/src/log/commitlog/commit_log_keystore.dart @@ -58,9 +58,11 @@ class CommitLogKeyStore extends BaseCommitLogKeyStore { } /// Returns the latest committed sequence number with regex - Future lastCommittedSequenceNumberWithRegex(String regex) async { + Future lastCommittedSequenceNumberWithRegex(String regex, + {List? enrolledNamespace}) async { var lastCommittedEntry = (getBox() as Box).values.lastWhere( - (entry) => (_acceptKey(entry.atKey, regex)), + (entry) => (_acceptKey(entry.atKey, regex, + enrolledNamespace: enrolledNamespace)), orElse: () => NullCommitEntry()); var lastCommittedSequenceNum = (lastCommittedEntry != null) ? lastCommittedEntry.key : null; @@ -177,8 +179,30 @@ class CommitLogKeyStore extends BaseCommitLogKeyStore { } } - bool _acceptKey(String atKey, String regex) { - return _isRegexMatches(atKey, regex) || _isSpecialKey(atKey); + bool _acceptKey(String atKey, String regex, + {List? enrolledNamespace}) { + return _isNamespaceAuthorised(atKey, enrolledNamespace) && + (_isRegexMatches(atKey, regex) || _isSpecialKey(atKey)); + } + + bool _isNamespaceAuthorised(String atKey, List? enrolledNamespace) { + // This is work-around for : https://github.com/atsign-foundation/at_server/issues/1570 + if (atKey.toLowerCase() == 'configkey') { + return true; + } + String? keyNamespace = AtKey.fromString(atKey).namespace; + // If enrolledNamespace is null or keyNamespace is null, fallback to + // existing behaviour - the key is authorized for the client to receive. So return true. + if (enrolledNamespace == null || + enrolledNamespace.isEmpty || + (keyNamespace == null || keyNamespace.isEmpty)) { + return true; + } + if (enrolledNamespace.contains('*') || + enrolledNamespace.contains(keyNamespace)) { + return true; + } + return false; } bool _isRegexMatches(String atKey, String regex) { @@ -186,10 +210,10 @@ class CommitLogKeyStore extends BaseCommitLogKeyStore { } bool _isSpecialKey(String atKey) { - return atKey.contains(AT_ENCRYPTION_SHARED_KEY) || + return atKey.contains(AtConstants.atEncryptionSharedKey) || atKey.startsWith('public:') || - atKey.contains(AT_PKAM_SIGNATURE) || - atKey.contains(AT_SIGNING_PRIVATE_KEY); + atKey.contains(AtConstants.atPkamSignature) || + atKey.contains(AtConstants.atSigningPrivateKey); } /// Returns the latest commitEntry of the key. diff --git a/packages/at_persistence_secondary_server/pubspec.yaml b/packages/at_persistence_secondary_server/pubspec.yaml index 46bf959b4..5b57518c0 100644 --- a/packages/at_persistence_secondary_server/pubspec.yaml +++ b/packages/at_persistence_secondary_server/pubspec.yaml @@ -1,6 +1,6 @@ name: at_persistence_secondary_server description: A Dart library with the implementation classes for the persistence layer of the secondary server. -version: 3.0.57 +version: 3.0.58 repository: https://github.com/atsign-foundation/at_server homepage: https://docs.atsign.com/ diff --git a/packages/at_persistence_secondary_server/test/commit_log_test.dart b/packages/at_persistence_secondary_server/test/commit_log_test.dart index 9b8fb42fa..c393b0c42 100644 --- a/packages/at_persistence_secondary_server/test/commit_log_test.dart +++ b/packages/at_persistence_secondary_server/test/commit_log_test.dart @@ -133,10 +133,10 @@ void main() async { for (int i = 0; i < 10; i++) { if (i % 2 == 0) { await commitLogKeystore.getBox().add(CommitEntry( - 'test_key_false_$i', CommitOp.UPDATE, DateTime.now())); + 'test_key_false_$i.wavi@alice', CommitOp.UPDATE, DateTime.now())); } else { await commitLogKeystore.getBox().add(CommitEntry( - 'test_key_false_$i', CommitOp.UPDATE, DateTime.now()) + 'test_key_false_$i.wavi@alice', CommitOp.UPDATE, DateTime.now()) ..commitId = i); } } From 4359c7fbbb5048b02257f7a020134000d3555996 Mon Sep 17 00:00:00 2001 From: Sitaram Kalluri Date: Mon, 16 Oct 2023 11:39:25 +0530 Subject: [PATCH 13/13] fix: dart lint issues --- .../at_compaction_stats_service_impl.dart | 6 +- .../lib/src/log/commitlog/at_commit_log.dart | 6 +- .../lib/src/model/at_meta_data.dart | 78 +++++++++---------- .../test/at_compaction_stats_test.dart | 4 +- .../test/commit_log_test.dart | 4 +- .../test/hive_keystore_impl_test.dart | 2 +- 6 files changed, 52 insertions(+), 48 deletions(-) diff --git a/packages/at_persistence_secondary_server/lib/src/compaction/at_compaction_stats_service_impl.dart b/packages/at_persistence_secondary_server/lib/src/compaction/at_compaction_stats_service_impl.dart index 239fc35fa..210627ce3 100644 --- a/packages/at_persistence_secondary_server/lib/src/compaction/at_compaction_stats_service_impl.dart +++ b/packages/at_persistence_secondary_server/lib/src/compaction/at_compaction_stats_service_impl.dart @@ -38,13 +38,13 @@ class AtCompactionStatsServiceImpl implements AtCompactionStatsService { ///changes the value of [compactionStatsKey] to match the AtLogType being processed void _getKey() { if (_atCompaction is AtCommitLog) { - compactionStatsKey = commitLogCompactionKey; + compactionStatsKey = AtConstants.commitLogCompactionKey; } if (_atCompaction is AtAccessLog) { - compactionStatsKey = accessLogCompactionKey; + compactionStatsKey = AtConstants.accessLogCompactionKey; } if (_atCompaction is AtNotificationKeystore) { - compactionStatsKey = notificationCompactionKey; + compactionStatsKey = AtConstants.notificationCompactionKey; } } } diff --git a/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart b/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart index 63ca99d91..de249cb53 100644 --- a/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart +++ b/packages/at_persistence_secondary_server/lib/src/log/commitlog/at_commit_log.dart @@ -87,8 +87,10 @@ class AtCommitLog extends BaseAtCommitLog { /// Returns the latest committed sequence number with regex @server - Future lastCommittedSequenceNumberWithRegex(String regex,{List? enrolledNamespace}) async { - return await _commitLogKeyStore.lastCommittedSequenceNumberWithRegex(regex, enrolledNamespace: enrolledNamespace); + Future lastCommittedSequenceNumberWithRegex(String regex, + {List? enrolledNamespace}) async { + return await _commitLogKeyStore.lastCommittedSequenceNumberWithRegex(regex, + enrolledNamespace: enrolledNamespace); } /// Returns the first committed sequence number diff --git a/packages/at_persistence_secondary_server/lib/src/model/at_meta_data.dart b/packages/at_persistence_secondary_server/lib/src/model/at_meta_data.dart index 9e3f2cd58..d4224ac66 100644 --- a/packages/at_persistence_secondary_server/lib/src/model/at_meta_data.dart +++ b/packages/at_persistence_secondary_server/lib/src/model/at_meta_data.dart @@ -136,21 +136,21 @@ class AtMetaData extends HiveObject { map['refreshAt'] = refreshAt?.toUtc().toString(); map['status'] = status; map['version'] = version; - map[AT_TTL] = ttl; - map[AT_TTB] = ttb; - map[AT_TTR] = ttr; - map[CCD] = isCascade; - map[IS_BINARY] = isBinary; - map[IS_ENCRYPTED] = isEncrypted; - map[PUBLIC_DATA_SIGNATURE] = dataSignature; - map[SHARED_KEY_ENCRYPTED] = sharedKeyEnc; - map[SHARED_WITH_PUBLIC_KEY_CHECK_SUM] = pubKeyCS; - map[ENCODING] = encoding; - map[ENCRYPTING_KEY_NAME] = encKeyName; - map[ENCRYPTING_ALGO] = encAlgo; - map[IV_OR_NONCE] = ivNonce; - map[SHARED_KEY_ENCRYPTED_ENCRYPTING_KEY_NAME] = skeEncKeyName; - map[SHARED_KEY_ENCRYPTED_ENCRYPTING_ALGO] = skeEncAlgo; + map[AtConstants.ttl] = ttl; + map[AtConstants.ttb] = ttb; + map[AtConstants.ttr] = ttr; + map[AtConstants.ccd] = isCascade; + map[AtConstants.isBinary] = isBinary; + map[AtConstants.isEncrypted] = isEncrypted; + map[AtConstants.publicDataSignature] = dataSignature; + map[AtConstants.sharedKeyEncrypted] = sharedKeyEnc; + map[AtConstants.sharedWithPublicKeyCheckSum] = pubKeyCS; + map[AtConstants.encoding] = encoding; + map[AtConstants.encryptingKeyName] = encKeyName; + map[AtConstants.encryptingAlgo] = encAlgo; + map[AtConstants.ivOrNonce] = ivNonce; + map[AtConstants.sharedKeyEncryptedEncryptingKeyName] = skeEncKeyName; + map[AtConstants.sharedKeyEncryptedEncryptingAlgo] = skeEncAlgo; return map; } @@ -178,33 +178,33 @@ class AtMetaData extends HiveObject { : (json['version'] == null) ? 0 : json['version']; - ttl = (json[AT_TTL] is String) - ? int.parse(json[AT_TTL]) - : (json[AT_TTL] == null) + ttl = (json[AtConstants.ttl] is String) + ? int.parse(json[AtConstants.ttl]) + : (json[AtConstants.ttl] == null) ? null - : json[AT_TTL]; - ttb = (json[AT_TTB] is String) - ? int.parse(json[AT_TTB]) - : (json[AT_TTB] == null) + : json[AtConstants.ttl]; + ttb = (json[AtConstants.ttb] is String) + ? int.parse(json[AtConstants.ttb]) + : (json[AtConstants.ttb] == null) ? null - : json[AT_TTB]; - ttr = (json[AT_TTR] is String) - ? int.parse(json[AT_TTR]) - : (json[AT_TTR] == null) + : json[AtConstants.ttb]; + ttr = (json[AtConstants.ttr] is String) + ? int.parse(json[AtConstants.ttr]) + : (json[AtConstants.ttr] == null) ? null - : json[AT_TTR]; - isCascade = json[CCD]; - isBinary = json[IS_BINARY]; - isEncrypted = json[IS_ENCRYPTED]; - dataSignature = json[PUBLIC_DATA_SIGNATURE]; - sharedKeyEnc = json[SHARED_KEY_ENCRYPTED]; - pubKeyCS = json[SHARED_WITH_PUBLIC_KEY_CHECK_SUM]; - encoding = json[ENCODING]; - encKeyName = json[ENCRYPTING_KEY_NAME]; - encAlgo = json[ENCRYPTING_ALGO]; - ivNonce = json[IV_OR_NONCE]; - skeEncKeyName = json[SHARED_KEY_ENCRYPTED_ENCRYPTING_KEY_NAME]; - skeEncAlgo = json[SHARED_KEY_ENCRYPTED_ENCRYPTING_ALGO]; + : json[AtConstants.ttr]; + isCascade = json[AtConstants.ccd]; + isBinary = json[AtConstants.isBinary]; + isEncrypted = json[AtConstants.isEncrypted]; + dataSignature = json[AtConstants.publicDataSignature]; + sharedKeyEnc = json[AtConstants.sharedKeyEncrypted]; + pubKeyCS = json[AtConstants.sharedWithPublicKeyCheckSum]; + encoding = json[AtConstants.encoding]; + encKeyName = json[AtConstants.encryptingKeyName]; + encAlgo = json[AtConstants.encryptingAlgo]; + ivNonce = json[AtConstants.ivOrNonce]; + skeEncKeyName = json[AtConstants.sharedKeyEncryptedEncryptingKeyName]; + skeEncAlgo = json[AtConstants.sharedKeyEncryptedEncryptingAlgo]; return this; } diff --git a/packages/at_persistence_secondary_server/test/at_compaction_stats_test.dart b/packages/at_persistence_secondary_server/test/at_compaction_stats_test.dart index cf90ce779..a4958076e 100644 --- a/packages/at_persistence_secondary_server/test/at_compaction_stats_test.dart +++ b/packages/at_persistence_secondary_server/test/at_compaction_stats_test.dart @@ -76,7 +76,7 @@ Future main() async { // Get Compaction Stats AtData? atData = await secondaryPersistenceStore! .getSecondaryKeyStore() - ?.get(at_commons.commitLogCompactionKey); + ?.get(at_commons.AtConstants.commitLogCompactionKey); // Assert Compaction Stats var decodedData = jsonDecode(atData!.data!) as Map; @@ -110,7 +110,7 @@ Future main() async { await atCompactionStatsServiceImpl.handleStats(atCompactionStats); AtData? atData = await secondaryPersistenceStore! .getSecondaryKeyStore() - ?.get(at_commons.accessLogCompactionKey); + ?.get(at_commons.AtConstants.accessLogCompactionKey); var data = (atData?.data); var decodedData = jsonDecode(data!) as Map; expect(decodedData["deletedKeysCount"], '3'); diff --git a/packages/at_persistence_secondary_server/test/commit_log_test.dart b/packages/at_persistence_secondary_server/test/commit_log_test.dart index c393b0c42..5fef444a3 100644 --- a/packages/at_persistence_secondary_server/test/commit_log_test.dart +++ b/packages/at_persistence_secondary_server/test/commit_log_test.dart @@ -133,7 +133,9 @@ void main() async { for (int i = 0; i < 10; i++) { if (i % 2 == 0) { await commitLogKeystore.getBox().add(CommitEntry( - 'test_key_false_$i.wavi@alice', CommitOp.UPDATE, DateTime.now())); + 'test_key_false_$i.wavi@alice', + CommitOp.UPDATE, + DateTime.now())); } else { await commitLogKeystore.getBox().add(CommitEntry( 'test_key_false_$i.wavi@alice', CommitOp.UPDATE, DateTime.now()) diff --git a/packages/at_persistence_secondary_server/test/hive_keystore_impl_test.dart b/packages/at_persistence_secondary_server/test/hive_keystore_impl_test.dart index 21ac071ab..994a8d8ed 100644 --- a/packages/at_persistence_secondary_server/test/hive_keystore_impl_test.dart +++ b/packages/at_persistence_secondary_server/test/hive_keystore_impl_test.dart @@ -238,7 +238,7 @@ void main() async { var keyStore = keyStoreManager.getSecondaryKeyStore()!; var atData = AtData(); atData.data = '123'; - final result = await keyStore.put(AT_PKAM_PRIVATE_KEY, atData); + final result = await keyStore.put(AtConstants.atPkamPrivateKey, atData); expect(result, isA()); });