Commit Graph

149 Commits

Author SHA1 Message Date
a06d8b0ca6 renamed converge package to matchmaker. 2024-09-08 11:16:49 +02:00
4f06fd71e0 renamed modukle name so that pkgsite will work. 2024-09-08 11:16:49 +02:00
813d398ea4 message now indicates what to do when using ssh and when using sftp 2024-09-08 11:16:49 +02:00
061fabfd07 Addes agent address and client address to the client and agent info. 2024-09-08 11:16:49 +02:00
ad72c41347 ClientConnection no longer has public fields. 2024-09-08 11:16:49 +02:00
db1d908d06 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-09-08 11:16:49 +02:00
1c92fcb03e 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-09-08 11:16:49 +02:00
c2ec1ce117 Added agent uid to the client info so that client and agent can be correlated in prometheus/grafana. 2024-09-08 11:16:49 +02:00
21ffd29ae4 Now showing information superscripts to hint that there are tooltipos available. 2024-09-08 11:16:49 +02:00
8e131c44a3 Now also logging the user's shell. 2024-09-08 11:16:49 +02:00
82a21ad4f6 One additional logging so that the user's environment info is also known. 2024-09-08 11:16:49 +02:00
5b7d51f210 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-09-08 11:16:49 +02:00
0bb9812b59 added tooltips. 2024-09-08 11:16:49 +02:00
0c18689afd Generalized persistence of forms in separate js file.
Some minor improvements to the usage instructions.
2024-09-08 11:16:49 +02:00
2fe2be0b9a 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-09-08 11:16:49 +02:00
29ddb6ce00 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-09-08 11:16:49 +02:00
f3d0074f17 added environment info from the client. 2024-09-08 11:16:49 +02:00
Erik Brakkee
b4b962d859 remove some console logs in the javascript
prometheus now listening on separate port
fixed powershell command for setting up authorized keys.
2024-09-08 11:16:49 +02:00
85841bcb0f read of 0 bytes to detect connection loss. 2024-09-08 11:16:49 +02:00
52ca0f3ecc consistent lower case on the usage page 2024-09-08 11:16:49 +02:00
564a8792f9 an attempt to avoid flickering of the image (not 100% successful) 2024-09-08 11:16:49 +02:00
b0aaec03fe Added a banner and logo. 2024-09-08 11:16:49 +02:00
f62b81cbfb cumulative counters implemented. 2024-09-08 11:16:49 +02:00
97d34424ca prometheus monitoring now more complete. Including a guid to uniquely identify agents and clients. 2024-09-08 11:16:49 +02:00
Erik Brakkee
135fd081d8 prometheus support step 1
updates to documentation.
2024-09-08 11:16:49 +02:00
2366b78e95 ClientId is now a string instead of an int. 2024-09-08 11:16:49 +02:00
ae60b77eec public id is now shown on the sessions page since authorized keys are
used which is safer.
2024-09-08 11:16:49 +02:00
cd953c5edf eliminated the username. 2024-09-08 11:16:49 +02:00
Erik Brakkee
d109c72f66 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-09-08 11:16:49 +02:00
8d554a5ce1 getting the bootstrap icons (not checking them in).
Split up instructions for working with agents.
2024-09-08 11:16:49 +02:00
1b1f8f2167 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-09-08 11:16:49 +02:00
51be117200 Simple validation of the id and the authorized keys. 2024-09-08 11:16:49 +02:00
75e1bd77ba Alternative contextpath is now supported.
This will simplify hosting in cases where you have no control over DNS but only over one domain.
2024-09-08 11:16:49 +02:00
9456665a6f 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-09-08 11:16:49 +02:00
2df296d3c3 fixed issue in usage page where local shell was not used at all. 2024-09-08 11:16:49 +02:00
b41317c598 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-09-08 11:16:49 +02:00
49db7578a7 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-09-08 11:16:49 +02:00
62b51a6d09 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-09-08 11:16:49 +02:00
4f6d9c209d relative link to websocket did not work for some reason, reverted back to /.... link 2024-09-08 11:16:49 +02:00
Erik Brakkee
830594740b * 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-09-08 11:16:49 +02:00
c45b6ed090 fixed typo 2024-09-08 11:16:49 +02:00
b332c0fe4c remark about tcptows 2024-09-08 11:16:49 +02:00
a9bd539175 Updated documentation:
* remote shell usage for linux, cmd, and powershell
* help of wsproxy.
2024-09-08 11:16:49 +02:00
adee89cc08 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-09-08 11:16:49 +02:00
52954a4bdb Using # instead of id in the sessions page to avoid confusion with the term id used in the docs. 2024-09-08 11:16:49 +02:00
Erik Brakkee
e141007f0a Now displaying agent number instead of id.
Passing timezone to server side for rendering of time stamps
Configuration of preferred shells.
2024-09-08 11:16:49 +02:00
d6fc2e4118 Rendering status as HTML tables. 2024-09-08 11:16:49 +02:00
638dffd143 doing the same thing as before but now rendering the
status using a template.
2024-09-08 11:16:49 +02:00
Erik Brakkee
882f97fa17 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-09-08 11:16:49 +02:00
0f10e1d8e7 typo in usage.html 2024-09-08 11:16:49 +02:00
9d460b9cf3 usage fix (agent was renamed by intellij to session)
Now using embedded timezone database by go so setting the TZ variable will work.
2024-09-08 11:16:49 +02:00
d6d2d5648c Live updates of the sessions.
V1 in ascii-art. To be improved.
2024-09-08 11:16:49 +02:00
100771a7ba restructuring 2024-09-08 11:16:49 +02:00
60d641a1a4 When a duplicate id is requested the server now allocates a new unique id so that the session can be handled anyway. 2024-09-08 11:16:49 +02:00
64f2460bc9 Adding rm/del instruction for agents. 2024-09-08 11:16:49 +02:00
816e8d8609 refactoring towards being able to send events from Admin to UI (websocket) without exposing connection info but only metadata. 2024-09-08 11:16:49 +02:00
7783ab51a8 removed hardcoded host used for testing. 2024-09-08 11:16:49 +02:00
0e8ed86be3 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-09-08 11:16:49 +02:00
f6ea7a56a9 tabbed interface. 2024-09-08 11:16:49 +02:00
e0771c095b split up in separate pages. 2024-09-08 11:16:49 +02:00
80a536c70e docs page now working again. 2024-09-08 11:16:49 +02:00
48f2d3a9e5 extracted basepage. 2024-09-08 11:16:49 +02:00
8fd17ed75d Split up the main page into different parts. 2024-09-08 11:16:49 +02:00
fcfe8a6637 Split up the main page into different parts. 2024-09-08 11:16:49 +02:00
9db9c927e6 Fixed typo: continous continuous. 2024-09-08 11:16:49 +02:00
4b05d7e8d8 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-09-08 11:16:49 +02:00
e01a2bc729 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-09-08 11:16:49 +02:00
788050df32 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-09-08 11:16:49 +02:00
9d0675b2f2 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-09-08 11:16:49 +02:00
ada34495ef 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-09-08 11:16:49 +02:00
d3cbf8388f 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-09-08 11:16:49 +02:00
8eba25575e password of converge now configurable through
CONVERGE_USERNAME and CONVERGE_PASSWORD environment
variables.
2024-09-08 11:16:48 +02:00
Erik Brakkee
d839583f7b 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-09-08 11:16:48 +02:00
40e8d56429 removed read and write dead lines. Appears to be still working. 2024-09-08 11:16:48 +02:00
6f4929301d status update now reported to the server. More robustness needed. 2024-09-08 11:16:48 +02:00
ffeca2a533 First version with basic communication from agent to server working. 2024-09-08 11:16:48 +02:00
ff9adfeb24 Extraction of communication setup in separate entity with client and related server code close together to make the setup easier to understand. 2024-09-08 11:16:48 +02:00
f862f31832 every user login resets agent expiry now. 2024-09-08 11:16:48 +02:00
ddc3b24ebf clean solution for concurrence in session.go by serializing all external calls (apart from initialization) through a channel. 2024-09-08 11:16:48 +02:00
Erik Brakkee
7351fdaf9c welcome message for users now specific for windows and linux
monitoring of hold file changes and messaging to users to provide more
  interactivity
2024-09-08 11:16:48 +02:00
9b2e8709fb added fsnotify example, to check bahavior on windows. 2024-09-08 11:16:48 +02:00
Erik Brakkee
8c44943a48 * fixes for windows
* detect kill ssh session
* include sftp session in the count of ssh sessions
* log session type in the agent
2024-09-08 11:16:48 +02:00
55c93ad4e2 Windows terminal support using the termtest library.
Should even support resizing. Fully untested.
2024-09-08 11:16:48 +02:00
d2801d0019 windows build now also working but without pty support. 2024-09-08 11:16:48 +02:00
1e422dd698 refactoring to support both windows and linux with totally different Pty code. 2024-09-08 11:16:48 +02:00
Erik Brakkee
2f40f86294 cross compilation on windows working.
pty.Start() is not supported on windows
2024-09-08 11:16:48 +02:00
cb00c5e4eb renamed cidebug module to converge 2024-09-08 11:16:48 +02:00
9fc0241d08 lots of work to make it actually work.
Icluding the server keep alive interval.
Fix where expiry duration was added twice.
2024-09-08 11:16:48 +02:00
aa46ed7b5c Lots of work on docuemtation. The docs page now shows the correct
installation dependent URLs. For now using ServerALiveInterval
to avoid disconnects.
2024-09-08 11:16:48 +02:00
85caa6cb5a simple session management solution with a .hold file and messages to the
user with better formatting.
2024-09-08 11:16:48 +02:00
e945e7453b basic session management is now implemented. 2024-09-08 11:16:48 +02:00
ed922a235f agent now uses a fixed host key using the go embed package.
Printing welcome message when user logs in.
2024-09-08 11:16:48 +02:00
1d2a047dfc lots of restructuring.
Experimensts with websockets over yamux failed. Now going to use a
second connection to the server from the agent.
2024-09-08 11:16:48 +02:00
3e6ec05877 moved websocket utils to separate package to allow use by the agent. 2024-09-08 11:16:48 +02:00
783a8db7a6 structuring into packages 2024-09-08 11:16:48 +02:00
41403476c6 working server
* administration appears coorect
* multiple clients for one agent
* logging of active connections
* simple echo server on the agent.
2024-09-08 11:16:48 +02:00
feb4639c7d dynamic publicId now working with single connection to agent. Cleanup is not working yet. 2024-09-08 11:16:48 +02:00
58ee5d7e85 further generalizatio of synchronizing two streams of data. 2024-09-08 11:16:48 +02:00
6b9dc2bfbe moved websocket wrapper to iowrappers package. 2024-09-08 11:16:48 +02:00