Commit Graph

1961 Commits

Author SHA1 Message Date
Charlie Crane
2f50feb0a0 #2706 - Removing redundant unit test from 2024-07-30 11:11:08 +01:00
Charlie Crane
2b33a6edb4 #2706 - New unit test to show that Terminal is able to send/handle install commands 2024-07-30 11:04:55 +01:00
Charlie Crane
ab26798240 #2706 - New test to check that the terminal can receive and process commmands. 2024-07-30 10:23:34 +01:00
Charlie Crane
bb0ecb93a4 #2706 - Correcting whitespace change in database_service.py and actioning some review comments 2024-07-30 09:57:47 +01:00
Charlie Crane
e492f19a43 #2706 - Small change to execute method following feedback 2024-07-29 17:10:13 +01:00
Charlie Crane
f78cb24150 #2706 - Removed some un-necessary comments and changes to network used in terminal ACL unit test 2024-07-29 14:20:29 +01:00
Charlie Crane
586e3f6389 Merged PR 488: #2713 - Terminal Request Manager Methods
## Summary
This PR merges the initial implementation of the terminals use of the `RequestManager`. Introducing the ability to send commands to `Login`, `Remote Login` and `Execute`.

## Test process
Unit test written for the request manager.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [X] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code

Related work items: #2713
2024-07-29 09:56:08 +00:00
Charlie Crane
cf7341a4fd #2713 - Minor changes before merging into main Terminal branch 2024-07-29 10:50:32 +01:00
Charlie Crane
0ac1c6702c #2713 - eod commit. Initial RequestManager Test implemented, along with an initial setup of the additional Request Manager methods. 2024-07-26 16:56:03 +01:00
Charlie Crane
978e2c5a52 Merged PR 483: Terminal Login Handling
## Summary
This PR updates the new Terminal Component to include logic for handling local/remote login attempts.
The Terminal will use the `UserSessionManager` on it's parent node to validate user credentials when receiving a login request.
`UserSessionManager` will return a connection uuid which can be used to validate remote session and used throughout following terminal commands to authenticate it's login session.
Terminal should now be able to track multiple remote connections to itself by maintaining a dict of `TerminalClientConnection` objects, indexed by their connection uuid.

This PR also broadens the contents of the `SSHPacket` class, introducing `SSHUserCredentials` which hold the username/password being used for login.

## Test process
Unit tests currently fail during the login as this PR does not merge in the `UserSessionManager` implementation as that is still in development.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [X] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code

Related work items: #2712
2024-07-24 12:40:10 +00:00
Charlie Crane
a0e675a09a #2712 - Minor changes to login Validator 2024-07-24 11:20:01 +01:00
Charlie Crane
1cb6ce02e0 #2712 - Correcting the use of TerminalClientConnection for remote connections. Terminal should hold a list of active remote connections to itself with connection uuid for validation 2024-07-24 10:38:12 +01:00
Charlie Crane
26a26a808f Merge branch 'dev' into feature/2706-Terminal_Sim_Component 2024-07-24 08:33:12 +01:00
Charlie Crane
a36e34ee1d #2712 - Prepping ahead of raising PR. 2024-07-24 08:31:24 +01:00
Charlie Crane
9d5b58ce44 Merge branch 'dev' into feature/2712-Terminal_Login_Handling 2024-07-23 15:52:42 +01:00
Charlie Crane
a7f9e4502e #2712 - Updates to the login logic and fixing resultant test failures. Updates to terminal.rst and ssh.py 2024-07-23 15:18:20 +01:00
Chris McCarthy
e67b4b54ce bumped version number and ran pre-commit 2024-07-22 14:46:58 +01:00
Chris McCarthy
db50a4d457 Merge remote-tracking branch 'refs/remotes/origin/release/3.2.0' into dev
# Conflicts:
#	src/primaite/VERSION
2024-07-22 14:38:01 +01:00
Chris McCarthy
85a530382c merged 3.1.0 into dev for git history alignment [skip ci] 2024-07-22 14:30:33 +01:00
Chris McCarthy
8ce39a09ad merged 3.0.0 into dev for git history alignment [skip ci] 2024-07-22 14:06:08 +01:00
Chris McCarthy
6bfe1510e8 merged 3.1.0 into 3.2.0 for git history alignment [skip ci] 2024-07-22 13:59:28 +01:00
Chris McCarthy
9dd1d6b742 merged 3.0.0 into 3.1.0 for git history alignment [skip ci] 2024-07-22 13:50:29 +01:00
Chris McCarthy
0789244df8 refactored the performance benchmark plot so that there's no benchmark threshold line and all bars are blue [skip ci] 2024-07-22 10:12:43 +01:00
Charlie Crane
3c590a8733 #2712 - Commit before changing branches 2024-07-22 09:58:09 +01:00
Defence Science and Technology Laboratory UK
4631f19e84 Automated benchmark output commit for version 3.2.0 [skip ci] 2024-07-21 09:10:19 +00:00
Chris McCarthy
4ae3573f70 release/3.2.0 2024-07-21 07:44:26 +01:00
Defence Science and Technology Laboratory UK
3f7d6c6ba6 Automated benchmark output commit for version 3.1.0 [skip ci] 2024-07-20 18:36:58 +00:00
Chris McCarthy
fba85cebfd retrospectively benchmarked 3.1.0 using the new benchmark process 2024-07-20 17:15:53 +01:00
Defence Science and Technology Laboratory UK
7f9acc4329 Automated benchmark output commit for version 3.0.0 [skip ci] 2024-07-20 16:11:46 +00:00
Chris McCarthy
213e301e58 retrospectively benchmarked 3.0.0 using the new benchmark process 2024-07-20 15:05:56 +01:00
Archer.Bowen
22d10bf0d5 #2734 Minor grammatical issue. 2024-07-19 14:28:00 +01:00
Archer Bowen
da13eb3dea Merged PR 472: User Guide Updates - Following Feedback
Implements the following changes:

**Moving some of the text from index.html into about.html (reduces repeated text**)

Index.html (home)
	i.	Overview
	ii.	Features (the ones we have listed currently in v3.2.0)
About.html
	i.	Architecture
	ii.	Training & Evaluation Capability
	iii.	What is PrimAITE built with
	iv.	Getting started with PrimAITE

**Adds deepdiff and sb3_contrib to the dependencies list**

![image.png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image.png)

**NMAP headers were inconsistent with other documentation. **

This may be an issue with the other documentation rather than NMAP however refactoring every header could cause a lot more headache.

![image (2).png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image%20%282%29.png)

**General Improvements**

Small link fixes

changing up python outdated python information

adding the common.config to .rst documents that didnt have them previously.

Related work items: #2734
2024-07-19 11:52:02 +00:00
Archer.Bowen
bd9f69f062 #2734 Forgot the comma.... 2024-07-19 12:22:22 +01:00
Archer.Bowen
047117cba0 #2734 Slight grammatical improvements following PR 2024-07-19 12:21:16 +01:00
Archer.Bowen
3ff0a37a71 #2734 User guide feedback core changes. 2024-07-19 11:54:10 +01:00
Charlie Crane
5c04f4fa4c Merge branch 'dev' into feature/2712-Terminal_Login_Handling 2024-07-19 11:18:34 +01:00
Charlie Crane
155562cb68 #2712 - Commit before merging in changes on dev 2024-07-19 11:18:17 +01:00
Charlie Crane
2104a7ec7d #2712 - Commit before merging in changes on dev 2024-07-19 11:17:54 +01:00
Archer.Bowen
538c9e1e42 #2734 User Guide Update fixes. 2024-07-18 17:52:31 +01:00
Christopher McCarthy
7ccfea9c57 Merged PR 470: Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool'
## Summary
Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool'

## Test process
Manually tested that it runs end-to-end

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

Related work items: #2758
2024-07-17 19:17:15 +00:00
Christopher McCarthy
28ee00d990 Merged PR 469: Bumped version number to 3.3.0-dev0
Bumped version number to 3.3.0-dev0

Related work items: #2630
2024-07-17 19:15:14 +00:00
Christopher McCarthy
b651ee3837 fixed line ending in VERSION 2024-07-17 16:08:30 +00:00
Christopher McCarthy
6b14d6de44 Bumped version number to 3.3.0-dev0 2024-07-17 15:45:25 +00:00
Archer Bowen
05c33b57e0 Merged PR 465: 2734 - Initial User Guide Updates
## Summary
3.2 User Guide Updates for 3.2 release.

Related work items: #2734
2024-07-17 15:18:17 +00:00
Archer.Bowen
819062b627 2734 - updated following pr v2 2024-07-17 16:15:56 +01:00
Christopher McCarthy
b83bab2e2e #2758 - Updated azure-benchmark-pipeline.yaml 2024-07-17 14:34:51 +00:00
Christopher McCarthy
2900ca9b2a #2758 - Updated azure-benchmark-pipeline.yaml so that is created a venv on the vm 2024-07-17 14:33:44 +00:00
Christopher McCarthy
c7431fa0c8 #2758 - Updated azure-benchmark-pipeline.yaml to use python3.10 on the yak pool vm 2024-07-17 14:20:53 +00:00
Christopher McCarthy
f409d0c27c #2758 - Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool' 2024-07-17 14:11:48 +00:00
Archer.Bowen
8bc84e33be Updated following PR 2024-07-17 15:07:37 +01:00