From 786bce17b49e0b64b6a9f02493083fbc2814d023 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 02:25:47 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks [CI
SKIP]
for more information, see https://pre-commit.ci
---
.devcontainer/devcontainer.json | 2 +-
.devcontainer/postCreateCommand.sh | 2 +-
.dockerignore | 2 +-
.gitattributes | 2 +-
.github/dependabot.yml | 2 +-
.gitignore | 2 +-
.woodpecker/.web.yml | 2 +-
LICENSE | 2 +-
Makefile | 4 +-
README.md | 2 +-
agent/.env.example | 2 +-
docker/.htaccess | 2 +-
docker/Dockerfile.agent | 4 +-
docker/Dockerfile.server.arm64 | 2 +-
docker/my-httpd.conf | 34 ++++++-------
docs/docs/30-env-vars.md | 2 +-
nfpm/agent.yaml | 2 +-
server/.dockerignore | 2 +-
server/.gitattributes | 2 +-
server/.gitignore | 2 +-
shared/trsa/testData/data.txt | 2 +-
shared/trsa/testData/data.txt.signature | 2 +-
shared/trsa/testData/privateKey | 2 +-
shared/trsa/testData/publicKey | 2 +-
shared/trsa/trsa_test.go | 24 +++++-----
web/.prettierignore | 2 +-
web/.prettierrc.json | 2 +-
web/index.html | 2 +-
web/jsconfig.json | 2 +-
web/src/@core/scss/_vertical-nav.scss | 2 +-
web/src/@core/scss/base/_utilities.scss | 2 +-
web/src/@core/scss/base/_vertical-nav.scss | 2 +-
.../@core/scss/libs/vuetify/_variables.scss | 2 +-
web/src/@core/scss/template/_components.scss | 48 +++++++++----------
web/src/@core/scss/template/_variables.scss | 8 ++--
.../@core/scss/template/_vertical-nav.scss | 2 +-
.../template/libs/vuetify/_overrides.scss | 2 +-
.../template/libs/vuetify/_variables.scss | 16 +++----
web/src/@core/scss/template/pages/misc.scss | 4 +-
web/src/@core/utils/formatters.js | 8 ++--
web/src/@core/utils/helpers.js | 4 +-
.../@layouts/components/VerticalNavLayout.vue | 2 +-
web/src/@layouts/utils.js | 2 +-
web/src/App.vue | 8 ++--
web/src/assets/images/svg/paypal.svg | 2 +-
.../DefaultLayoutWithVerticalNav.vue | 6 +--
web/src/layouts/components/UserProfile.vue | 2 +-
web/src/pages/login.vue | 4 +-
web/src/pages/my-account.vue | 2 +-
web/src/pages/register.vue | 2 +-
web/src/plugins/router/index.js | 4 +-
web/src/plugins/vuetify/icons.js | 2 +-
.../views/dashboard/AnalyticsBarCharts.vue | 2 +-
.../AnalyticsTotalProfitLineCharts.vue | 2 +-
.../views/dashboard/AnalyticsUserTable.vue | 4 +-
.../dashboard/AnalyticsWeeklyOverview.vue | 2 +-
.../my-account/AccountSettingsAccount.vue | 4 +-
57 files changed, 133 insertions(+), 133 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3f5e9bb..fef71a6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -18,4 +18,4 @@
],
"remoteUser": "root",
"postCreateCommand": "bash .devcontainer/postCreateCommand.sh"
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
index 780226e..82469e3 100644
--- a/.devcontainer/postCreateCommand.sh
+++ b/.devcontainer/postCreateCommand.sh
@@ -18,4 +18,4 @@ npm install
cd ..
-echo 'Container ready!'
\ No newline at end of file
+echo 'Container ready!'
diff --git a/.dockerignore b/.dockerignore
index 998fad1..b9ecc0e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,4 +6,4 @@ npm-debug.log
.coverage.*
.env
.aws
-vendor
\ No newline at end of file
+vendor
diff --git a/.gitattributes b/.gitattributes
index 4922abf..a88a4bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,4 +18,4 @@
*.sh text eol=lf
*.txt text eol=lf
*.xml text eol=lf
-*.vue text eol=lf
\ No newline at end of file
+*.vue text eol=lf
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3702b19..e51446f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -49,4 +49,4 @@ updates:
commit-message:
prefix: fix
prefix-development: chore
- include: scope
\ No newline at end of file
+ include: scope
diff --git a/.gitignore b/.gitignore
index 52ead70..b0fcb14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,4 +141,4 @@ dist
*.so
*.dylib
vendor/
-__debug_bin
\ No newline at end of file
+__debug_bin
diff --git a/.woodpecker/.web.yml b/.woodpecker/.web.yml
index 225d346..1f70711 100644
--- a/.woodpecker/.web.yml
+++ b/.woodpecker/.web.yml
@@ -30,4 +30,4 @@ steps:
directory: web/
commands:
- npm run lint
- when: *when
\ No newline at end of file
+ when: *when
diff --git a/LICENSE b/LICENSE
index 5929ae2..a449c41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,4 +200,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
diff --git a/Makefile b/Makefile
index bf1bb6a..825eace 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# *
# * Portions of this file were derived from Woodpecker CI
# * https://github.com/woodpecker-ci/woodpecker/blob/main/Makefile
-# *
+# *
# * Woodpecker CI's licensed under the Apache License 2.0.
# * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
# *
@@ -188,4 +188,4 @@ bundle-agent: bundle-prepare ## Create bundles for agent
VERSION_NUMBER=$(VERSION_NUMBER) nfpm package --config ./nfpm/agent.yaml --target ./dist --packager rpm
.PHONY: bundle
-bundle: bundle-agent ## Create all bundles
\ No newline at end of file
+bundle: bundle-agent ## Create all bundles
diff --git a/README.md b/README.md
index f72e4aa..9e2681e 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ ContainerEchoes is an open-source tool designed for efficient real-time Docker l
- **Web Interface and API**: Manage, query, and display logs through a user-friendly web interface and a robust API.
- **Flexible Log Retention**: Automatic log deletion after 48 hours, with options for longer retention.
- **Secure and Scalable**: Implements TLS/SSL for secure data transfer and is designed for scalability.
-
+
## Docker Image Support
ContainerEchoes provides Docker images for both its agent and server components, ensuring wide compatibility across different systems:
diff --git a/agent/.env.example b/agent/.env.example
index 3bb4130..5aa9743 100644
--- a/agent/.env.example
+++ b/agent/.env.example
@@ -1,2 +1,2 @@
ECHOES_SERVER=localhost:5000
-ECHOES_AGENT_SECRET=
\ No newline at end of file
+ECHOES_AGENT_SECRET=
diff --git a/docker/.htaccess b/docker/.htaccess
index 3201b3f..adc80b1 100644
--- a/docker/.htaccess
+++ b/docker/.htaccess
@@ -6,4 +6,4 @@ RewriteRule ^api/(.*) http://localhost:5000/$1 [P,L]
# If the request is not for a real file or directory, serve index.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^ index.html [L]
\ No newline at end of file
+RewriteRule ^ index.html [L]
diff --git a/docker/Dockerfile.agent b/docker/Dockerfile.agent
index 7c016b9..8153c72 100644
--- a/docker/Dockerfile.agent
+++ b/docker/Dockerfile.agent
@@ -4,7 +4,7 @@
# *
# * Portions of this file were derived from Woodpecker CI
# * https://github.com/woodpecker-ci/woodpecker
-# *
+# *
# * Woodpecker CI's licensed under the Apache License 2.0.
# * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
# *
@@ -31,4 +31,4 @@ EXPOSE 3000
COPY --from=build /src/dist/echoes-agent /bin/
COPY --from=build /etc/echoes/agent /etc
-ENTRYPOINT ["/bin/echoes-agent"]
\ No newline at end of file
+ENTRYPOINT ["/bin/echoes-agent"]
diff --git a/docker/Dockerfile.server.arm64 b/docker/Dockerfile.server.arm64
index 5609264..ac4ff38 100644
--- a/docker/Dockerfile.server.arm64
+++ b/docker/Dockerfile.server.arm64
@@ -62,4 +62,4 @@ RUN chmod +x /etc/services.d/apache/run /etc/services.d/nodejs/run
EXPOSE 80
# Use s6-overlay as the entrypoint
-ENTRYPOINT ["/init"]
\ No newline at end of file
+ENTRYPOINT ["/init"]
diff --git a/docker/my-httpd.conf b/docker/my-httpd.conf
index 9e92c4b..fdcdc84 100644
--- a/docker/my-httpd.conf
+++ b/docker/my-httpd.conf
@@ -2,20 +2,20 @@
# This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions.
# See for detailed information.
-# In particular, see
+# In particular, see
#
# for a discussion of each configuration directive.
#
# Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure
-# consult the online docs. You have been warned.
+# consult the online docs. You have been warned.
#
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
-# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
# will be interpreted as '/logs/access_log'.
#
@@ -45,7 +45,7 @@ ServerRoot "/usr/local/apache2"
# ports, instead of the default. See also the
# directive.
#
-# Change this to Listen on specific IP addresses as shown below to
+# Change this to Listen on specific IP addresses as shown below to
# prevent Apache from glomming onto all bound IP addresses.
#
#Listen 12.34.56.78:80
@@ -201,7 +201,7 @@ LoadModule rewrite_module modules/mod_rewrite.so
#
# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
+# httpd as root initially and it will switch.
#
# User/Group: The name (or #number) of the user/group to run httpd as.
# It is usually good practice to create a dedicated user and group for
@@ -242,7 +242,7 @@ ServerName 0.0.0.0:80
#
# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other
+# explicitly permit access to web content directories in other
# blocks below.
#
@@ -300,8 +300,8 @@ DocumentRoot "/usr/local/apache2/htdocs"
#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
#
Require all denied
@@ -354,8 +354,8 @@ LogLevel warn
#
- # Redirect: Allows you to tell clients about documents that used to
- # exist in your server's namespace, but do not anymore. The client
+ # Redirect: Allows you to tell clients about documents that used to
+ # exist in your server's namespace, but do not anymore. The client
# will make a new request for the document at its new location.
# Example:
# Redirect permanent /foo http://www.example.com/bar
@@ -372,7 +372,7 @@ LogLevel warn
# the filesystem path.
#
- # ScriptAlias: This controls which directories contain server scripts.
+ # ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
# documents in the target directory are treated as applications and
# run by the server when requested rather than as documents sent to the
@@ -484,10 +484,10 @@ LogLevel warn
#MaxRanges unlimited
#
-# EnableMMAP and EnableSendfile: On systems that support it,
+# EnableMMAP and EnableSendfile: On systems that support it,
# memory-mapping or the sendfile syscall may be used to deliver
# files. This usually improves server performance, but must
-# be turned off when serving from networked-mounted
+# be turned off when serving from networked-mounted
# filesystems or if support for these functions is otherwise
# broken on your system.
# Defaults: EnableMMAP On, EnableSendfile Off
@@ -497,9 +497,9 @@ LogLevel warn
# Supplemental configuration
#
-# The configuration files in the conf/extra/ directory can be
-# included to add extra features or to modify the default configuration of
-# the server, or you may simply copy their contents here and change as
+# The configuration files in the conf/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
# necessary.
# Server-pool management (MPM specific)
@@ -547,4 +547,4 @@ Include conf/extra/proxy-html.conf
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
-
\ No newline at end of file
+
diff --git a/docs/docs/30-env-vars.md b/docs/docs/30-env-vars.md
index b2571a4..b07c5f9 100644
--- a/docs/docs/30-env-vars.md
+++ b/docs/docs/30-env-vars.md
@@ -75,4 +75,4 @@ Remember to replace `localhost` with your actual database host.
## Next Steps
-With your environment variables configured, you can proceed to [Configuring the Container Echoes Agent](agent-configuration).
\ No newline at end of file
+With your environment variables configured, you can proceed to [Configuring the Container Echoes Agent](agent-configuration).
diff --git a/nfpm/agent.yaml b/nfpm/agent.yaml
index c0e1394..52b86b2 100644
--- a/nfpm/agent.yaml
+++ b/nfpm/agent.yaml
@@ -4,7 +4,7 @@
# *
# * Portions of this file were derived from Woodpecker CI
# * https://github.com/woodpecker-ci/woodpecker
-# *
+# *
# * Woodpecker CI's licensed under the Apache License 2.0.
# * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
# *
diff --git a/server/.dockerignore b/server/.dockerignore
index 654eeeb..f789b5a 100644
--- a/server/.dockerignore
+++ b/server/.dockerignore
@@ -8,4 +8,4 @@
.env
# Ignore build output for vue
-web/dist
\ No newline at end of file
+web/dist
diff --git a/server/.gitattributes b/server/.gitattributes
index 4922abf..a88a4bc 100644
--- a/server/.gitattributes
+++ b/server/.gitattributes
@@ -18,4 +18,4 @@
*.sh text eol=lf
*.txt text eol=lf
*.xml text eol=lf
-*.vue text eol=lf
\ No newline at end of file
+*.vue text eol=lf
diff --git a/server/.gitignore b/server/.gitignore
index baf9d29..c668632 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -134,4 +134,4 @@ version
# Ignore IDE files
.idea
-.vscode
\ No newline at end of file
+.vscode
diff --git a/shared/trsa/testData/data.txt b/shared/trsa/testData/data.txt
index 46d4eac..4c0e5db 100644
--- a/shared/trsa/testData/data.txt
+++ b/shared/trsa/testData/data.txt
@@ -6,4 +6,4 @@ Also, it is transporting information on plain http. that is an advantage for the
A great use case can specially found, as the keys can be perfectly used for authentication. If you can share keys face to face, there will be nothing to break into your communications. This technology, can be perfect, for plain message exchange like chat, or more integrated transactions, up to the use in distributed applications and blockchain.
-The usage is documented in the modules README on npm. It is really easy, try it out.
\ No newline at end of file
+The usage is documented in the modules README on npm. It is really easy, try it out.
diff --git a/shared/trsa/testData/data.txt.signature b/shared/trsa/testData/data.txt.signature
index eced33f..677adcb 100644
--- a/shared/trsa/testData/data.txt.signature
+++ b/shared/trsa/testData/data.txt.signature
@@ -1 +1 @@
-a152828c8864ac9cc59ddb34ad8f46a9134cb2b2fd3d53419a8be0db5fc410748e146192dc4fe3d6012dc3c36ab4ff669b123106d177e7444dede42cf3ce5d72bd464d78c4a9cf151fcc63431c3fcea08ac4424c97af7ad97e1ee01992685f972c724aa0e18af9cb57965d7b7fec95a782ebd4fa62a802082a5336d5e34d75302ffe85d74d57c5739f65760c4b2168b030ced77a856f9e34ffbc7d694a6dc0fbc739a9f7708e0c993a47cb97362672006e6758d904c4486026a0840d52bc17eeb9cb48edd77c8197df2225bb9e42a3ff39df21dfb6fed8ef9c171f9b0314e469344c235474aaa5685f39f72b579efae2efbb122c2495394444df7ad7f3fe1467
\ No newline at end of file
+a152828c8864ac9cc59ddb34ad8f46a9134cb2b2fd3d53419a8be0db5fc410748e146192dc4fe3d6012dc3c36ab4ff669b123106d177e7444dede42cf3ce5d72bd464d78c4a9cf151fcc63431c3fcea08ac4424c97af7ad97e1ee01992685f972c724aa0e18af9cb57965d7b7fec95a782ebd4fa62a802082a5336d5e34d75302ffe85d74d57c5739f65760c4b2168b030ced77a856f9e34ffbc7d694a6dc0fbc739a9f7708e0c993a47cb97362672006e6758d904c4486026a0840d52bc17eeb9cb48edd77c8197df2225bb9e42a3ff39df21dfb6fed8ef9c171f9b0314e469344c235474aaa5685f39f72b579efae2efbb122c2495394444df7ad7f3fe1467
diff --git a/shared/trsa/testData/privateKey b/shared/trsa/testData/privateKey
index dc6e44f..a217ee1 100644
--- a/shared/trsa/testData/privateKey
+++ b/shared/trsa/testData/privateKey
@@ -24,4 +24,4 @@ VtM/j6qz5L3YVvZ8L95W5tD3cWTYgtI3JlETGPkjchmPGushXzxIX7HpIgxoMY9K
yelLAQKBgQDEua1+xkuvUMZFlIvP+bsqFrxRrjfMUlXE3/EdwHCQWMh481ttmJqi
Ugs5rTJUBJK6aHeDB9Jush9FPW69/N3oECsSs9OQfs7p9EZGb5TXv72mRufpHOX+
ccmA1wkkQZXHydN3PE9IxZTPYt+pJlhikNbAgHMTIE57DQz0/ac+yw==
------END RSA PRIVATE KEY-----
\ No newline at end of file
+-----END RSA PRIVATE KEY-----
diff --git a/shared/trsa/testData/publicKey b/shared/trsa/testData/publicKey
index e6af170..427b954 100644
--- a/shared/trsa/testData/publicKey
+++ b/shared/trsa/testData/publicKey
@@ -6,4 +6,4 @@ kJk1pMcVtnfZv+8z9qWyRVpzMccRPHrdnnIvkTYNKV9h4+e5F1161rgQnngyUBtH
GHuI+lBS0bARj+C4O3M+OWYQKyHQzknq7yBXKHLlKbl5sGFbw5FiwRqWYboLOwfu
q8QC6VmkXdLX6gKpKBWl4LzInW9V8fXPacvmZYZxGDmCWkkjUM0123CjwWggneTX
AwIDAQAB
------END PUBLIC KEY-----
\ No newline at end of file
+-----END PUBLIC KEY-----
diff --git a/shared/trsa/trsa_test.go b/shared/trsa/trsa_test.go
index 25da13a..9a9aef4 100644
--- a/shared/trsa/trsa_test.go
+++ b/shared/trsa/trsa_test.go
@@ -47,12 +47,12 @@ func TestEncryptDecrypt(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
- data := []byte(`This weekend I made great progress for building secure independent apps.
- With t-secure-express I provide a module, to have RSA encrypted communication between
- a js web client and your express application. Both client and server are using my trsa
- library, that is based on node-forge. So it is easy, for both sites to create their
- crypto material. Also, the for the server side provided middleware can get applied to
- any new or existing app. To enable secure RSA encrypted communication, without the need
+ data := []byte(`This weekend I made great progress for building secure independent apps.
+ With t-secure-express I provide a module, to have RSA encrypted communication between
+ a js web client and your express application. Both client and server are using my trsa
+ library, that is based on node-forge. So it is easy, for both sites to create their
+ crypto material. Also, the for the server side provided middleware can get applied to
+ any new or existing app. To enable secure RSA encrypted communication, without the need
for bothersome and for some part expensive and deployment delaying https certificates.
Using this tech, you can establish secure connections on your timeline. `)
encrypted, err := keypair.Encrypt(data)
@@ -75,12 +75,12 @@ func TestSignVerify(t *testing.T) {
if err != nil {
t.Fatal(err.Error())
}
- data := []byte(`This weekend I made great progress for building secure independent apps.
- With t-secure-express I provide a module, to have RSA encrypted communication between
- a js web client and your express application. Both client and server are using my trsa
- library, that is based on node-forge. So it is easy, for both sites to create their
- crypto material. Also, the for the server side provided middleware can get applied to
- any new or existing app. To enable secure RSA encrypted communication, without the need
+ data := []byte(`This weekend I made great progress for building secure independent apps.
+ With t-secure-express I provide a module, to have RSA encrypted communication between
+ a js web client and your express application. Both client and server are using my trsa
+ library, that is based on node-forge. So it is easy, for both sites to create their
+ crypto material. Also, the for the server side provided middleware can get applied to
+ any new or existing app. To enable secure RSA encrypted communication, without the need
for bothersome and for some part expensive and deployment delaying https certificates.
Using this tech, you can establish secure connections on your timeline. `)
signature, err := keypair.Sign(data)
diff --git a/web/.prettierignore b/web/.prettierignore
index db4c6d9..de4d1f0 100644
--- a/web/.prettierignore
+++ b/web/.prettierignore
@@ -1,2 +1,2 @@
dist
-node_modules
\ No newline at end of file
+node_modules
diff --git a/web/.prettierrc.json b/web/.prettierrc.json
index 9b8b61a..f430b9e 100644
--- a/web/.prettierrc.json
+++ b/web/.prettierrc.json
@@ -17,4 +17,4 @@
"vueIndentScriptAndStyle": false,
"endOfLine": "lf",
"singleAttributePerLine": true
-}
\ No newline at end of file
+}
diff --git a/web/index.html b/web/index.html
index 8499d43..6788d22 100644
--- a/web/index.html
+++ b/web/index.html
@@ -88,4 +88,4 @@