Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Made message signing in Cryptography use SHA512 as the message content for... #1

Closed
netkas wants to merge 421 commits from master into dev
pull from: master
merge into: Nosial:dev
Conversation 3 Commits 421 Files changed 226 +32 -32
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fc9e80785d - Show all commits

64
docker-compose.test.yml
View file

@ -5,25 +5,25 @@
services: services:
# Coffee Service (coffee.com test) # Coffee Service (coffee.com test)
socialbox_coffee: coffee_socialbox:
container_name: socialbox_coffee container_name: coffee_socialbox
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
ports: ports:
- "8086:8085" - "8086:8085"
depends_on: depends_on:
mariadb_coffee: coffee_mariadb:
condition: service_healthy condition: service_healthy
redis_coffee: coffee_redis:
condition: service_healthy condition: service_healthy
networks: networks:
- coffee_network - coffee_network
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./socialbox_coffee/config:/etc/config - ./coffee_socialbox/config:/etc/config
- ./socialbox_coffee/logs:/var/log - ./coffee_socialbox/logs:/var/log
- ./socialbox_coffee/data:/etc/socialbox - ./coffee_socialbox/data:/etc/socialbox
environment: environment:
# No need to change these values # No need to change these values
LOG_LEVEL: ${LOG_LEVEL:-debug} LOG_LEVEL: ${LOG_LEVEL:-debug}
@ -44,13 +44,13 @@ services:
SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10} SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20} SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20} SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
SB_DATABASE_HOST: mariadb_coffee SB_DATABASE_HOST: coffee_mariadb
SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox} SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox} SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox} SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true} SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
SB_CACHE_ENGINE: redis SB_CACHE_ENGINE: redis
SB_CACHE_HOST: redis_coffee SB_CACHE_HOST: coffee_redis
SB_CACHE_PORT: ${SB_CACHE_PORT:-6379} SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root} SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root} SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
@ -59,16 +59,16 @@ services:
# Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD> # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
# Environment Variable name is ignored, only the value is used with the prefix being used to detect # Environment Variable name is ignored, only the value is used with the prefix being used to detect
# the instance name and the suffix being used to detect the TXT record # the instance name and the suffix being used to detect the TXT record
SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-http://127.0.0.1:8086/} SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com <txt>"}
SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-http://127.0.0.1:8087/} SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com <txt>"}
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8086/}"] test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8086/}"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 3 retries: 3
start_period: 40s start_period: 40s
mariadb_coffee: coffee_mariadb:
container_name: socialbox_coffee_mariadb container_name: coffee_socialbox_mariadb
image: mariadb:10.5 image: mariadb:10.5
restart: unless-stopped restart: unless-stopped
environment: environment:
@ -83,13 +83,13 @@ services:
expose: expose:
- "3306" - "3306"
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "mariadb_coffee", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"] test: ["CMD", "mysqladmin", "ping", "-h", "coffee_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
start_period: 30s start_period: 30s
redis_coffee: coffee_redis:
container_name: socialbox_coffee_redis container_name: coffee_socialbox_redis
image: redis:alpine image: redis:alpine
restart: unless-stopped restart: unless-stopped
command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes
@ -108,25 +108,25 @@ services:
start_period: 5s start_period: 5s
# Teapot Service (teapot.com test) # Teapot Service (teapot.com test)
socialbox_teapot: teapot_socialbox:
container_name: socialbox_teapot container_name: teapot_socialbox
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
ports: ports:
- "8087:8085" # Unique port for Teapot instance - "8087:8085" # Unique port for Teapot instance
depends_on: depends_on:
mariadb_teapot: teapot_mariadb:
condition: service_healthy condition: service_healthy
redis_teapot: teapot_redis:
condition: service_healthy condition: service_healthy
networks: networks:
- teapot_network - teapot_network
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./socialbox_teapot/config:/etc/config - ./teapot_socialbox/config:/etc/config
- ./socialbox_teapot/logs:/var/log - ./teapot_socialbox/logs:/var/log
- ./socialbox_teapot/data:/etc/socialbox - ./teapot_socialbox/data:/etc/socialbox
environment: environment:
# No need to change these values # No need to change these values
LOG_LEVEL: ${LOG_LEVEL:-debug} LOG_LEVEL: ${LOG_LEVEL:-debug}
@ -147,13 +147,13 @@ services:
SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10} SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20} SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20} SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
SB_DATABASE_HOST: mariadb_teapot SB_DATABASE_HOST: teapot_mariadb
SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox} SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox} SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox} SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true} SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
SB_CACHE_ENGINE: redis SB_CACHE_ENGINE: redis
SB_CACHE_HOST: redis_teapot SB_CACHE_HOST: teapot_redis
SB_CACHE_PORT: ${SB_CACHE_PORT:-6379} SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root} SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root} SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
@ -162,16 +162,16 @@ services:
# Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD> # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
# Environment Variable name is ignored, only the value is used with the prefix being used to detect # Environment Variable name is ignored, only the value is used with the prefix being used to detect
# the instance name and the suffix being used to detect the TXT record # the instance name and the suffix being used to detect the TXT record
SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-http://127.0.0.1:8086/} SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com <txt>"}
SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-http://127.0.0.1:8087/} SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com <txt>"}
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8087/}"] test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8087/}"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 3 retries: 3
start_period: 40s start_period: 40s
mariadb_teapot: teapot_mariadb:
container_name: socialbox_teapot_mariadb container_name: teapot_socialbox_mariadb
image: mariadb:10.5 image: mariadb:10.5
restart: unless-stopped restart: unless-stopped
environment: environment:
@ -186,13 +186,13 @@ services:
expose: expose:
- "3306" - "3306"
healthcheck: healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "mariadb_teapot", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"] test: ["CMD", "mysqladmin", "ping", "-h", "teapot_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 3 retries: 3
start_period: 30s start_period: 30s
redis_teapot: teapot_redis:
container_name: socialbox_teapot_redis container_name: teapot_socialbox_redis
image: redis:alpine image: redis:alpine
restart: unless-stopped restart: unless-stopped
command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes