Merge pull request #58 from seashell/dev

dev

docs/_coverpage.md

@@ -18,10 +18,9 @@
 
 - Single-binary, lightweight
 - Encrypted node-to-node communication
-- Dynamic network configuration
-- Support for userspace WireGuard implementations
-- Extensible via REST API
+- Support for different WireGuard implementations
 - Slick management dashboard
+- Extensible via REST API
 
 [GitHub](https://github.com/seashell/drago/)
 [Get Started](/docs/)

docs/_sidebar.md

@@ -21,7 +21,7 @@
   * acl
     * [Overview](/docs/commands/acl/)
     * [bootstrap](/docs/commands/acl/bootstrap)
-    * [policy upsert](/docs/commands/acl/policy-upsert)
+    * [policy apply](/docs/commands/acl/policy-apply)
     * [policy delete](/docs/commands/acl/policy-delete)
     * [policy list](/docs/commands/acl/policy-list)
     * [policy info](/docs/commands/acl/policy-info)

docs/css/custom.css

@@ -4,6 +4,10 @@
     background: var(--background)!important;
 }
 
+li:not(:last-child){
+    margin-bottom: 10px;
+}
+
 /* ----------------- Cover -----------------*/
 section.cover .cover-main>p{
     margin-top: 32px;

docs/docs/commands/README.md

@@ -1,8 +1,13 @@
 # Drago Commands (CLI)
 
-Drago is controlled via a very easy to use command-line interface (CLI). Drago is only a single command-line application: drago, which takes a subcommand such as "agent" or "status". The complete list of subcommands is in the navigation to the left.
 
-To view a list of the available commands at any time, just run Drago with no arguments. To get help for any specific subcommand, run the subcommand with the -h argument.
+Drago is controlled via a very easy to use command-line interface (CLI). Drago is only a single command-line application: `drago`, which takes subcommands such as `agent` or `status`. The complete list of subcommands is in the navigation to the left.
+
+The Drago CLI is a well-behaved command line application. In erroneous cases, a non-zero exit status will be returned. It also responds to `-h` and `--help` as you would most likely expect.
+
+To view a list of the available commands at any time, just run Drago with no arguments. To get help for any specific subcommand, run the subcommand with the `-h` argument.
+
+Each command has been conveniently documented on this website. Links to each command can be found on the left.
 
 ### Remote usage
 

docs/docs/commands/acl/README.md

@@ -11,7 +11,7 @@ Run `drago acl <subcommand> [options] -h` for help on a specific subcommand.
 Available subcommands:
 
 - [`acl bootstrap`](/docs/commands/acl/bootstrap): Bootstrap the ACL system
-- [`acl policy upsert`](/docs/commands/acl/policy-upsert): Create or update an ACL policy
+- [`acl policy apply`](/docs/commands/acl/policy-apply): Create or update an ACL policy
 - [`acl policy delete`](/docs/commands/acl/policy-delete): Delete an existing ACL policy
 - [`acl policy info`](/docs/commands/acl/policy-info): Display info on an existing ACL policy
 - [`acl policy list`](/docs/commands/acl/policy-list): List available ACL policies

docs/docs/overview.md

@@ -4,9 +4,9 @@
 > This section is still a work-in-progress. If you think you can contribute, please see our [contribution guidelines](docs/../../../contributing.md).
 
 
-Drago is a flexible configuration manager for WireGuard networks which is designed to make it simple to configure network overlays spanning heterogeneous nodes distributed across different clouds and physical locations.
+Drago is a flexible configuration manager for WireGuard networks that is designed to make it simple to configure network overlays spanning heterogeneous nodes distributed across different clouds and physical locations.
 
-Drago is meant to be simple, and provide a solid foundation for higher-level functionality. Need automatic IP assignment, dynamic firewall rules, or some kind of telemetry? You are free to implement on top of the already existing APIs.
+Drago is meant to be simple and provide a solid foundation for higher-level functionality. Need automatic IP assignment, dynamic firewall rules, or some kind of telemetry? You are free to implement it on top of the already existing APIs.
 
 ## Use-cases
 
@@ -20,11 +20,7 @@ Drago is meant to be simple, and provide a solid foundation for higher-level fun
 ## Main features
 
 - Single-binary, lightweight
-- Slick management dashboard
 - Encrypted node-to-node communication
-- Support for multiple storage backends
-- Support for userspace WireGuard implementations
-- Dynamic network configuration
-- Automatic key rotation
-- Extensible via REST API
-- Automatic IP assignment
+- Support for different WireGuard implementations
+- Slick management dashboard
+- Extensible via REST API

docs/index.html

@@ -82,7 +82,7 @@ <h3> Drago </h3>
             highlightColor: "#00eeee",
             codeTypeColor: "#ffffff",
             codeTextColor: "#ffffff",
-            codeBackgroudColor: "#111",
+            codeBackgroundColor: "#111",
             borderColor: "#444444",
             blockQuoteColour: "#858585",
             sidebarSublink: "#b4b4b4",
@@ -97,7 +97,7 @@ <h3> Drago </h3>
             background: "#ffffff",
             textColor: "#000000",
             codeTextColor: "#525252",
-            codeBackgroudColor: "#f8f8f8",
+            codeBackgroundColor: "#f8f8f8",
             borderColor: "rgba(0, 0, 0, 0.07)",
             blockQuoteColor: "#858585",
             sidebarSublink: "#000000",

drago/network.go

@@ -101,9 +101,23 @@ func (s *NetworkService) UpsertNetwork(args *structs.NetworkUpsertRequest, out *
 		return structs.NewInvalidInputError(err.Error())
 	}
 
-	if n.ID == "" {
+	isNewNetwork := n.ID == ""
+
+	if isNewNetwork {
 		n.ID = uuid.Generate()
 		n.CreatedAt = time.Now()
+
+		networks, err := s.state.Networks(ctx)
+		if err != nil {
+			return structs.NewInternalError(err.Error())
+		}
+
+		for _, net := range networks {
+			if net.Name == n.Name {
+				return structs.NewInvalidInputError("network name already in use")
+			}
+		}
+
 	} else {
 		old, err := s.state.NetworkByID(ctx, n.ID)
 		if err != nil {

ui/src/views/clients/details/index.js

@@ -178,14 +178,14 @@ const ClientDetails = () => {
   const handleConnectionChange = (id, values) => {
     const connection = {
       id,
-      PeerSettings: {
-        [values.interfaceId]: {
+      PeerSettings: [
+         {
           InterfaceID: values.interfaceId,
           RoutingRules: {
             AllowedIPs: values.allowedIPs,
           },
         },
-      },
+      ],
       persistentKeepalive: values.persistentKeepalive,
     }