Skip to content

Commit

Permalink
guac-session-integration-2 (kevoreilly#1115)
Browse files Browse the repository at this point in the history
useful commands to save:
* poetry run gunicorn --bind 0.0.0.0:8008 guac-session.asgi -D -t 180 -w 4 -k uvicorn.workers.UvicornWorker --capture-output --enable-stdio-inheritance
  • Loading branch information
doomedraven authored Aug 26, 2022
1 parent c036cb8 commit 41166cb
Show file tree
Hide file tree
Showing 35 changed files with 153 additions and 2,280 deletions.
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### [26-08-2022]
* [Interactive mode](https://github.com/kevoreilly/CAPEv2/pull/1065) thanks to @enzok. [Docs](https://capev2.readthedocs.io/en/latest/usage/interactive_desktop.html)
* [Interactive mode](https://github.com/kevoreilly/CAPEv2/pull/1065) thanks to @enzok based on his [guac-session](https://github.com/enzok/guac-session/). [Docs](https://capev2.readthedocs.io/en/latest/usage/interactive_desktop.html)

### [18-8-2022]
* Function `yara_detected` now returns 4 arguments. 4th is file metadata
Expand Down
9 changes: 9 additions & 0 deletions conf/web.conf
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,12 @@ username =
password =
guacd_host = localhost
guacd_port = 4822
# You migth need to add your server IP to ALLOWED_HOSTS in web/web/settings.py it it not ["*""]
# vnc or rdp
guest_protocol = vnc
guacd_recording_path = "/opt/capev2/storage/guacrecordings"
# rdp settings
guest_rdp_port = 3389
guest_width = 1280
guest_height = 1024

20 changes: 4 additions & 16 deletions docs/book/src/usage/interactive_desktop.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Instalation

.. warning::

* This section is not user friendly YET!
* We still have to integrate that to CAPE to be all in one.
* Doesn't support cluster mode.

To install dependencies please run::
Expand All @@ -22,20 +20,14 @@ New services added::
$ systemctl status guacd.service
$ systemctl status guac-web.service

Go to ``/opt/CAPEv2/guac-session`` folder and create the config::

$ cp sample.env .env
# edit .env
$ systemctl restart guac-web.service

Web server configuration
========================

Enable ``guacamole`` in ``conf/web.conf`` and restart ``cape-web.service``::
Enable and configure ``guacamole`` in ``conf/web.conf`` and restart ``cape-web.service``::

$ systemctl restart cape-web

You need to edit ``NGINX`` config to be able to use interactive mode, Example config.
In case you using ``NGINX``, you need to configure it, to be able to use interactive mode, Example config.

.. code-block:: python
Expand All @@ -47,10 +39,6 @@ You need to edit ``NGINX`` config to be able to use interactive mode, Example co
# CAPE
server 127.0.0.1:8000;
}
upstream nodeserver2 {
# guac-session
server 127.0.0.1:8008;
}
server {
listen <YOUR_DESIRED_IP>;
client_max_body_size 101M;
Expand All @@ -65,7 +53,7 @@ You need to edit ``NGINX`` config to be able to use interactive mode, Example co
alias /opt/CAPEv2/web/static/;
}
location /guac {
proxy_pass http://nodeserver2;
proxy_pass http://nodeserver1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_buffering off;
Expand Down Expand Up @@ -115,4 +103,4 @@ To test if your ``guacamole`` working correctly you can use this code
* If that doesn't work, check logs::

$ systemctl status guacd or journalctl -u guacd
$ cat /opt/CAPEv2/guac-session/guac-server.log
$ cat /opt/CAPEv2/web/guac-server.log
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions guac-session/Changelog.md

This file was deleted.

666 changes: 0 additions & 666 deletions guac-session/LICENSE

This file was deleted.

4 changes: 0 additions & 4 deletions guac-session/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions guac-session/guac-session/asgi.py

This file was deleted.

220 changes: 0 additions & 220 deletions guac-session/guac-session/settings.py

This file was deleted.

7 changes: 0 additions & 7 deletions guac-session/guac-session/urls.py

This file was deleted.

7 changes: 0 additions & 7 deletions guac-session/guac-session/wsgi.py

This file was deleted.

Empty file removed guac-session/guac/__init__.py
Empty file.
22 changes: 0 additions & 22 deletions guac-session/manage.py

This file was deleted.

Loading

0 comments on commit 41166cb

Please sign in to comment.