b6962e3cb6
Server side sorting for the websessions page. No longer using LinkedMap as a result.
2024-08-16 00:25:17 +02:00
deba6c7e91
Now using a map of ClientId to clientConnection which is more efficient for deleting clients.
2024-08-15 22:16:20 +02:00
cdfe7c2a47
Separated out the metadata about the agents and clients from the agentConnection and clientConnection objects. Now, the state does not need to be copied anymore when sending notifications.
...
The matchmaker uses copy on write every time a new agent or client connects or disconnects.
2024-08-15 22:08:24 +02:00
56ad9fbf03
concurrency for the expiry time
2024-08-15 21:25:30 +02:00
fd18a63360
now using maps of Guid to Agent/Client in the state, working towards the definitive solution.
...
Using LinkedMap that preserves insertion order for the implementation and also added unit tests for that.
2024-08-15 21:04:31 +02:00
98f6b414de
introdcution of typesafe ids.
2024-08-15 18:32:59 +02:00
5ff22f4b13
a bit more safety by copying the state when passing it to
...
the websessions and prometheus.
2024-08-14 11:36:36 +02:00
95fe8bb010
eliminated unused fields in State
...
Now preserving the lastState in prometheus.go in a State object instead
of in multiple values.
2024-08-14 11:26:31 +02:00
fd064f249f
using unbuffered channels everywhere now. Only change required was to initialize prometeus and the websessions before the matchmaker. This is because at startup the matchmaker wants to write a notification when it starts up but then prometheus and the websessions would not be there to read them.
...
Alternative solution would be to run all initialization code in go routines to make it independent of initialization order but having a defined initialization order is much cleaner.
2024-08-13 21:33:29 +02:00
aa05e5819b
fixed typos
2024-08-13 19:21:19 +02:00
3bbebd0dda
timezone handling now moved to a separate script that does not leak any symbols.
2024-08-13 11:33:15 +02:00
00a9a91788
added a utility function for logging request data.
2024-08-13 11:32:51 +02:00
bac7a9a6f1
Much imporoved websocket connection closure will now detect closing of
...
websockets immediately.
2024-08-13 10:57:05 +02:00
cb03b79630
updated the about page
2024-08-13 00:50:54 +02:00
df9409fc75
now a single websocket is opened from the webui to converge.
...
The browser sends a hello message anytime the user switches to the
sessions page, upon which the server sends the current state back.
THis also improves the timeout handling of broken connecions.
2024-08-12 23:44:07 +02:00
dfdea81c20
renamed converge package to matchmaker.
2024-08-12 21:53:26 +02:00
54165f83c7
renamed modukle name so that pkgsite will work.
2024-08-12 21:31:15 +02:00
31e59d998d
message now indicates what to do when using ssh and when using sftp
2024-08-12 16:18:27 +02:00
28b95ff5db
Addes agent address and client address to the client and agent info.
2024-08-12 15:23:07 +02:00
17f5e10547
ClientConnection no longer has public fields.
2024-08-11 19:01:39 +02:00
60e7cac61b
a lot of work to get prometheus monitoring better.
...
Now the duration is updated every second to get more accurate readings. Also, the time series are now cleaned up when they no longer exists. Previously, all time series were deleted and then everything was setup from scratch.
2024-08-11 17:49:52 +02:00
69a8a1aad3
much more clean handling of concurrency in the converge server by separating the administration from the matchmaking by putting admin in a separate package.
2024-08-11 16:17:11 +02:00
fc92286998
Added agent uid to the client info so that client and agent can be correlated in prometheus/grafana.
2024-08-10 18:57:57 +02:00
bd4e2c277b
Now showing information superscripts to hint that there are tooltipos available.
2024-08-10 17:49:41 +02:00
04c8b441ac
Now also logging the user's shell.
2024-08-10 17:28:51 +02:00
a56bb87983
One additional logging so that the user's environment info is also known.
2024-08-10 17:28:25 +02:00
1983ee24de
Code is more robust and should now never try to send a notification to a web client that can block, using a context with cancellation.
2024-08-10 17:27:50 +02:00
55468c7135
added tooltips.
2024-08-10 16:53:07 +02:00
2dffdfa442
Generalized persistence of forms in separate js file.
...
Some minor improvements to the usage instructions.
2024-08-10 16:26:49 +02:00
346996e761
with the previous fix connection loss was not detected anymore, now using the ping method based on writing data which is more robust but may take a bit longer for connection loss to be detected.
2024-08-10 13:23:59 +02:00
ffcf7c8599
the read call to check for connectivity was doing more harm than good. Removed it. In the end there were situations where the read was blocking indefinitely, finally leading to a deadlock situation.
2024-08-10 13:01:40 +02:00
7c387d5bb4
added environment info from the client.
2024-08-10 13:00:48 +02:00
Erik Brakkee
210b4ca0dd
remove some console logs in the javascript
...
prometheus now listening on separate port
fixed powershell command for setting up authorized keys.
2024-08-08 20:28:15 +02:00
14d72d077b
read of 0 bytes to detect connection loss.
2024-08-08 00:09:35 +02:00
4ced070495
consistent lower case on the usage page
2024-08-07 23:16:03 +02:00
11b0e997b1
an attempt to avoid flickering of the image (not 100% successful)
2024-08-07 23:12:25 +02:00
727ba4d75a
Added a banner and logo.
2024-08-07 23:09:40 +02:00
7af8c2a09b
cumulative counters implemented.
2024-08-07 22:22:54 +02:00
21e91a700c
prometheus monitoring now more complete. Including a guid to uniquely identify agents and clients.
2024-08-07 21:16:11 +02:00
b4da91f0e4
Merge remote-tracking branch 'origin/main'
2024-08-07 21:00:56 +02:00
86535683fa
ClientId is now a string instead of an int.
2024-08-07 21:00:41 +02:00
Erik Brakkee
9d1c6d6616
prometheus support step 1
...
updates to documentation.
2024-08-07 20:50:17 +02:00
68804761bf
public id is now shown on the sessions page since authorized keys are
...
used which is safer.
2024-08-06 22:50:24 +02:00
7af575119d
eliminated the username.
2024-08-06 22:38:59 +02:00
Erik Brakkee
3c803d6125
removed password based access
...
authorized keys can now be modified within the session.
keep last set of keys when no valid keys were found and keys are changed during the session .
2024-08-06 22:03:36 +02:00
95926c5896
getting the bootstrap icons (not checking them in).
...
Split up instructions for working with agents.
2024-08-05 23:19:41 +02:00
7e60e23df1
A lot of work in getting cut and paste from the UI to
...
work properly.
Wrote two web components. One for cut and paste in general, and another for code samples.
2024-08-05 22:51:49 +02:00
02914ae40f
Simple validation of the id and the authorized keys.
2024-08-04 23:31:12 +02:00
1b76add15b
Alternative contextpath is now supported.
...
This will simplify hosting in cases where you have no control over DNS but only over one domain.
2024-08-03 23:10:57 +02:00
b875540d6b
Preparation for alternative context path.
...
The contextpath parameter in converge.go is
temporary and should be removed later. What is needed is autodetectio of the context path for the usage page and passing on the context for rendering.
2024-08-03 22:40:26 +02:00
a6bbafe593
fixed issue in usage page where local shell was not used at all.
2024-08-03 21:18:44 +02:00
d3f9c9fd5a
Lots of work on making easier interactive documentation, especially to make working with SSH public keys really easy.
...
Next step is to do more validation in the UI.
Specifically:
* validate authorized keys
* detection of accidental use of a private key
Then, password based access can be disabled.
2024-08-03 21:03:29 +02:00
db44a20d5a
large parts of the usage is now dynamic.
...
Still need to generate instructions for authorized keys. A lot of troubleshooting for the form to cookie persistence.
2024-08-03 18:29:14 +02:00
91e1139881
work in progress:
...
* usage page now has more dynamic part where user
can enter id and publis ssh keys and the server will
generate the appropriate commmands to execute depending on the local and remote shell.
2024-08-03 12:54:32 +02:00
7b9d1cb1b2
relative link to websocket did not work for some reason, reverted back to /.... link
2024-08-03 08:46:16 +02:00
Erik Brakkee
21463a5cad
* session will now expire some time after last user
...
activity and updated documentation.
* downloads will now download again. Because of hx-boost
the downloads where rendered in the browser. Now
disabling hx-boost for the downloads section.
* relative link for sessions page
2024-08-02 20:58:46 +02:00
5a91d86b39
fixed typo
2024-08-01 21:23:41 +02:00
b49a4e7613
remark about tcptows
2024-08-01 21:01:27 +02:00
0d60b70ada
Updated documentation:
...
* remote shell usage for linux, cmd, and powershell
* help of wsproxy.
2024-08-01 20:53:52 +02:00
ff97c1ccd2
Now by default wsproxy uses a specific protocol to establish connections to the server. It does this by adding the ?wsproxy query parameter.
...
The server then sends it the protocol version and the client connection info describing whether an agent was found or not. This improves usability for users.
With the --raw option it bypasses this query parameter and wsproxy then works in the old way as a simple stdio-websocket connector. It then still works with converge server but can also be used for simple websocket troubleshooting.
2024-08-01 20:22:41 +02:00
5c251daa47
Using # instead of id in the sessions page to avoid confusion with the term id used in the docs.
2024-08-01 19:21:39 +02:00
Erik Brakkee
2e12d0a9fd
Now displaying agent number instead of id.
...
Passing timezone to server side for rendering of time stamps
Configuration of preferred shells.
2024-08-01 19:16:00 +02:00
4c52fb0f12
Rendering status as HTML tables.
2024-07-31 21:12:09 +02:00
885b7790d7
doing the same thing as before but now rendering the
...
status using a template.
2024-07-31 19:52:01 +02:00
Erik Brakkee
f0dd810541
many small changes
...
* removed the Async utility
* now using Ping message to webclient for keep alive instaed of actual content
* added remote shell to AgentInfo
* retry of connections to the agent
* better logging for SynchronizeStreams
2024-07-31 19:30:38 +02:00
658aaf3880
typo in usage.html
2024-07-30 23:55:09 +02:00
01c9cdd60a
usage fix (agent was renamed by intellij to session)
...
Now using embedded timezone database by go so setting the TZ variable will work.
2024-07-30 23:48:52 +02:00
9a3618f06b
Live updates of the sessions.
...
V1 in ascii-art. To be improved.
2024-07-30 21:51:30 +02:00
f382c02b41
restructuring
2024-07-30 19:59:13 +02:00
367043e0c5
When a duplicate id is requested the server now allocates a new unique id so that the session can be handled anyway.
2024-07-30 19:45:25 +02:00
c1e91f0aba
Adding rm/del instruction for agents.
2024-07-30 19:04:46 +02:00
bf5120aa5b
refactoring towards being able to send events from Admin to UI (websocket) without exposing connection info but only metadata.
2024-07-30 19:03:21 +02:00
5533b04a5e
removed hardcoded host used for testing.
2024-07-30 00:02:52 +02:00
39cf088a41
basic htmx with server sending content to the client over a websocket is now working. This only worked when text message where being sent so the websocket handling had to be made configurable with a 'text' boolean field.
2024-07-29 23:56:44 +02:00
77cffde408
tabbed interface.
2024-07-29 21:05:14 +02:00
68056b0b77
split up in separate pages.
2024-07-29 20:02:08 +02:00
f5135aecdc
docs page now working again.
2024-07-29 19:49:47 +02:00
fb8ed0622b
extracted basepage.
2024-07-29 19:23:01 +02:00
92504f4130
Split up the main page into different parts.
2024-07-29 19:16:48 +02:00
a4d5060163
Split up the main page into different parts.
2024-07-29 19:02:50 +02:00
f7e94c21f9
Fixed typo: continous continuous.
2024-07-29 18:32:11 +02:00
b1f7304eeb
Now rendering the index.html using the Templ library.
...
This is in preparation for:
1. creating a base page
2. using tabs: Home, Using, Downloads, Status
3. htmx
2024-07-28 21:31:17 +02:00
d17ad9bc3e
Added pprof to convergeserver and optionally to
...
the agent if PPROF_PORT is set.
Fixed issue with converge server not cleaning up goroutines because of blocking channel. Made sure to create channels with > 1 size everywhere it can be done. The blocking behavior of a default channel size is mostly in the way.
Known issue: Killing the SSH client will lead to the server side process not being terminated and some goroutines still running in the agent. This would require additional investigation to solve. The remote processes are still being cleaned up ok (at least on linux) when the agent exits.
This should not be an issue at all since the agent is a short-lived process and when running in a containerized environment with containers running on demand the cleanup will definitely work.
2024-07-28 11:48:31 +02:00
7a51e3ac45
Unique ids for clients generated by converge server and made available to the ssh session through a net.Conn extension that passes the ID to the SSH session through the LocalAddr().
2024-07-27 22:37:40 +02:00
5a492f3855
initialization of username, password on client (from server) and initialization of agentinfo on server is now done as soon as the agent registered and not through a side channel.
...
Making use of some simple utilities for GOB to make it easy to send objects over the line.
2024-07-27 20:46:53 +02:00
621bbd8ca6
GOB channel for easily and asynchronously using GOB on a single network connection, also dealing with timeouts and errors in a good way.
...
Protocol version is now checked when the agent connects to the converge server.
Next up: sending connection metadata and username password from server to agent and sending environment information back to the server. This means then that the side channel will only be used for expiry time messages and session type with the client id passed in so the converge server can than correlate the results back to the correct channel.
2024-07-27 11:21:35 +02:00
f82601d07c
Lots of refactoring.
...
Now hijacking the ssh connection setup in the listener to exchange some information before passing the connection on to the SSH server.
Next step is to do the full exchange of required information and to make it easy some simple Read and Write methods with timeouts are needed that use gob.
2024-07-26 22:40:56 +02:00
d02b7eade3
password of converge now configurable through
...
CONVERGE_USERNAME and CONVERGE_PASSWORD environment
variables.
2024-07-26 20:51:05 +02:00
Erik Brakkee
2ed81c3174
communication between agent and server. Removed the flags libray for command-line parsing.
...
Heartbeat mechanism from client to server over the custom connection for sending events to guarantee that the connectoin stays up.
2024-07-25 19:51:11 +02:00
d9f490a2b6
removed read and write dead lines. Appears to be still working.
2024-07-24 22:26:15 +02:00
78819f1ebe
status update now reported to the server. More robustness needed.
2024-07-24 22:03:12 +02:00
459300b0d3
First version with basic communication from agent to server working.
2024-07-24 21:39:14 +02:00
20ce37a1cb
Extraction of communication setup in separate entity with client and related server code close together to make the setup easier to understand.
2024-07-24 20:04:35 +02:00
3cd12f68f4
every user login resets agent expiry now.
2024-07-24 19:38:22 +02:00
689c8e63b4
clean solution for concurrence in session.go by serializing all external calls (apart from initialization) through a channel.
2024-07-24 19:23:51 +02:00
Erik Brakkee
bdedef12f0
welcome message for users now specific for windows and linux
...
monitoring of hold file changes and messaging to users to provide more
interactivity
2024-07-24 18:46:25 +02:00
1ed49c638e
added fsnotify example, to check bahavior on windows.
2024-07-23 22:55:03 +02:00
Erik Brakkee
75ac9a46f3
* fixes for windows
...
* detect kill ssh session
* include sftp session in the count of ssh sessions
* log session type in the agent
2024-07-23 19:26:59 +02:00
50d410f090
Windows terminal support using the termtest library.
...
Should even support resizing. Fully untested.
2024-07-22 23:55:37 +02:00
5280b8e838
windows build now also working but without pty support.
2024-07-22 23:07:26 +02:00
