Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
communications-backbone communications-backbone
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 25
    • Issues 25
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Metrics
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Communications Backbone System
  • communications-backbonecommunications-backbone
  • Merge requests
  • !6

Open
Created 2 years ago by Dan Jones@danjonOwner
  • Report abuse
Report abuse

Draft: Resolve "Add websockets"

  • Overview 0
  • Commits 12
  • Pipelines 3
  • Changes 18

Closes #11

  • Dan Jones @danjon changed milestone to %SoAR-2023W01 2 years ago

    changed milestone to %SoAR-2023W01

  • Dan Jones @danjon added Partner::NOC Status::In Progress labels 2 years ago

    added Partner::NOC Status::In Progress labels

  • Dan Jones @danjon added 7 commits 2 years ago

    added 7 commits

    • 0bfe2e95 - feat: work in progress socket implementation
    • bfbea127 - docs: notes about implementing socket logic
    • db5cf550 - fix: run api and socket on shared port
    • 989c2c6e - fix: handle lost connections cleanly
    • f8ed1438 - feat: listen for websockets connections
    • ee03332c - test: scripts for testing ws send receive
    • 3fb647af - docs: simplify usage for get_token to env var

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 1 commit 2 years ago

    added 1 commit

    • a7934233 - feat: wip wait for authenticated socket

    Compare with previous version

  • Dan Jones @danjon added 91 commits 2 years ago

    added 91 commits

    • a7934233...f987d4dc - 82 commits from branch dev
    • 4340ab77 - feat: work in progress socket implementation
    • 15ef1c33 - docs: notes about implementing socket logic
    • 53b2814a - fix: run api and socket on shared port
    • 4a39ec59 - fix: handle lost connections cleanly
    • 1cfacfb3 - feat: listen for websockets connections
    • 7a4fd2dd - test: scripts for testing ws send receive
    • 4a2e30ce - docs: simplify usage for get_token to env var
    • eef91eb7 - feat: wip wait for authenticated socket
    • 2b47cf1d - fix: tidy up post rebase

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 32 commits 2 months ago

    added 32 commits

    • 2b47cf1d...b9754c55 - 21 commits from branch dev
    • c0eb287c - feat: work in progress socket implementation
    • e783c022 - docs: notes about implementing socket logic
    • 56af4395 - fix: run api and socket on shared port
    • e40e65c1 - fix: handle lost connections cleanly
    • df1d21aa - feat: listen for websockets connections
    • 1b413f8a - test: scripts for testing ws send receive
    • 66a98281 - docs: simplify usage for get_token to env var
    • 56e226db - feat: wip wait for authenticated socket
    • 07d0646c - fix: tidy up post rebase
    • e2e861ee - fix: fixup after rebase needs testing
    • 3b0ed55a - fix: fixup refactored api after rebase

    Compare with previous version

    Toggle commit list
  • Dan Jones @danjon added 1 commit 2 months ago

    added 1 commit

    • 86b61a8f - fix: remove unused imports

    Compare with previous version

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • version 4
    3b0ed55a
    2 months ago

  • version 3
    2b47cf1d
    2 years ago

  • version 2
    a7934233
    2 years ago

  • version 1
    3fb647af
    2 years ago

  • dev (HEAD)

and
  • latest version
    86b61a8f
    12 commits, 2 months ago

  • version 4
    3b0ed55a
    11 commits, 2 months ago

  • version 3
    2b47cf1d
    9 commits, 2 years ago

  • version 2
    a7934233
    8 commits, 2 years ago

  • version 1
    3fb647af
    7 commits, 2 years ago

36 files
+ 1691
- 174
Show latest version
    File browser
    Compare changes
doc‎ker‎
Dev.Doc‎kerfile‎ +12 -0
Docke‎rfile‎ +14 -0
docker-compo‎se-test.yaml‎ +12 -0
docker-co‎mpose.yaml‎ +46 -0
endp‎oints‎
auth_res‎ource.py‎ +16 -12
clie‎nt.py‎ +90 -0
noti‎fy.py‎ +13 -7
recei‎ve.py‎ +4 -3
sen‎d.py‎ +13 -7
toke‎n.py‎ +10 -8
mod‎els‎
client_‎model.py‎ +86 -0
token_m‎odel.py‎ +25 -32
te‎sts‎
mod‎els‎
client_mod‎el_test.py‎ +135 -0
token_mod‎el_test.py‎ +130 -0
api_clien‎t_test.py‎ +84 -0
api_notif‎y_test.py‎ +59 -0
api_recei‎ve_test.py‎ +84 -0
api_send‎_test.py‎ +59 -0
api_toke‎n_test.py‎ +39 -0
.e‎nv‎ +3 -0
.giti‎gnore‎ +5 -2
.gitlab‎-ci.yml‎ +8 -0
LIC‎ENSE‎ +1 -1
READ‎ME.md‎ +198 -39
__ini‎t__.py‎ +0 -0
api‎.py‎ +1 -1
api_r‎est.py‎ +2 -2
client_c‎reate.py‎ +75 -0
conft‎est.py‎ +102 -0
logg‎er.py‎ +40 -0
requiremen‎ts-dev.txt‎ +5 -0
requirem‎ents.txt‎ +31 -0
rmq‎.py‎ +71 -25
run-com‎pose.sh‎ +33 -0
setu‎p.py‎ +16 -0
soar_‎bus.py‎ +169 -35
docker/Dev.Dockerfile
+ 12
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

FROM python:3.9.16
WORKDIR /app
# If we want to use the alpine image, we need these packages for pytest
# RUN apk update && apk add python3-dev gcc libc-dev libffi-dev
COPY requirements.txt requirements.txt
COPY requirements-dev.txt requirements-dev.txt
RUN pip install -r requirements.txt
RUN pip install -r requirements-dev.txt
\ No newline at end of file
docker/Dockerfile
+ 14
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

FROM python:3.9.16
WORKDIR /app
COPY . .
# If we want to use the alpine image, we need these packages for pytest
# RUN apk update && apk add python3-dev gcc libc-dev libffi-dev
COPY requirements.txt requirements.txt
COPY requirements-dev.txt requirements-dev.txt
RUN pip install -r requirements.txt
RUN pip install -r requirements-dev.txt
\ No newline at end of file
docker/docker-compose-test.yaml
+ 12
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

version: '3.8'
services:
soar_api_test:
build:
context: ..
dockerfile: docker/Dev.Dockerfile
volumes:
- ../:/app
environment:
- PYTHONDONTWRITEBYTECODE=1
command: "pytest -p no:cacheprovider"
container_name: soar_api_test
\ No newline at end of file
docker/docker-compose.yaml
+ 46
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

Files with large changes are collapsed by default.

version: '3.8'
services:
rabbitmq__local:
image: rabbitmq:management
restart: unless-stopped
ports:
- "5672:5672"
# - "15672:15672" # Admin web console
expose:
- "5672"
container_name: rmq
soar_bus:
build:
context: ..
dockerfile: docker/Dev.Dockerfile
restart: unless-stopped
depends_on:
- rabbitmq__local
environment:
- MQ_HOST=rmq
- LOG_LEVEL=${LOG_LEVEL:-DEBUG}
volumes:
- ../:/app
command: "python soar_bus.py"
container_name: soar_bus
soar_api:
build:
context: ..
dockerfile: docker/Dev.Dockerfile
restart: unless-stopped
ports:
- "8087:8087"
expose:
- "8087"
depends_on:
- rabbitmq__local
environment:
- MQ_HOST=rmq
- FLASK_HOST=0.0.0.0
- LOG_LEVEL=${LOG_LEVEL:-DEBUG}
volumes:
- ../:/app
command: "python api.py"
container_name: soar_api
\ No newline at end of file
endpoints/auth_resource.py
+ 16
- 12
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

endpoints/clients.py → endpoints/client.py
+ 90
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


endpoints/notify.py
+ 13
- 7
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


endpoints/receive.py
+ 4
- 3
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


endpoints/send.py
+ 13
- 7
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


endpoints/token.py
+ 10
- 8
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


models/client_model.py
+ 86
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

models/token.py → models/token_model.py
+ 25
- 32
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


tests/models/client_model_test.py
+ 135
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/models/token_model_test.py
+ 130
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/api_client_test.py
+ 84
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/api_notify_test.py
+ 59
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/api_receive_test.py
+ 84
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/api_send_test.py
+ 59
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

tests/api_token_test.py
+ 39
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

.env
+ 3
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

.gitignore
+ 5
- 2
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

.gitlab-ci.yml
+ 8
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

LICENSE
+ 1
- 1
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


README.md
+ 198
- 39
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


__init__.py deleted
+ 0
- 0
  • View file @ a7934233

api.py
+ 1
- 1
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

api_rest.py
+ 2
- 2
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


client_create.py
+ 75
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

conftest.py
+ 102
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

logger.py
+ 40
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

requirements-dev.txt
+ 5
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

requirements.txt
+ 31
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

rmq.py
+ 71
- 25
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


run-compose.sh
+ 33
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

setup.py
+ 16
- 0
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE

soar_bus.py
+ 169
- 35
  • View file @ 2b47cf1d

  • Edit in single-file editor

  • Edit in Web IDE


Assignee
Dan Jones's avatar
Dan Jones
@danjon
Assign to
0 Reviewers
None
Request review from
SoAR-2023W01
Milestone
SoAR-2023W01 (Past due)
Assign milestone
None
Time tracking
No estimate or time spent
2
Labels
Partner::NOC Status::In Progress
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
1
1 participant
user avatar
Reference: communications-backbone-system/communications-backbone!6
Source branch: 11-add-websockets

    0 pending comments