Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
197258c88c |
@@ -816,6 +816,13 @@ func enrol(ctx context.Context, opts options) error {
|
|||||||
Fingerprint: firstNonEmpty(reply.Fingerprint, token.Fingerprint),
|
Fingerprint: firstNonEmpty(reply.Fingerprint, token.Fingerprint),
|
||||||
Signer: firstNonEmpty2(reply.Signer, token.Signer),
|
Signer: firstNonEmpty2(reply.Signer, token.Signer),
|
||||||
Password: reply.Password,
|
Password: reply.Password,
|
||||||
|
// **Which bus this membership is for, said rather than left empty** (novox/hq
|
||||||
|
// 04-ISSUES/146). The link refuses a membership that names another bus, and an empty name
|
||||||
|
// is not this one's — so a node enrolled without it came up and reconnected for ever
|
||||||
|
// against its own record: "this membership is for \"\", and the mesh's bus is nats". The
|
||||||
|
// reply does not carry it because there is one bus and the host knows which (ADR 0131);
|
||||||
|
// what was missing was writing that down where the link reads it.
|
||||||
|
Transport: link.OnNATS,
|
||||||
}
|
}
|
||||||
if mine.Membership.Password == "" {
|
if mine.Membership.Password == "" {
|
||||||
// The mesh did not replace the token's secret, so it is still this node's broker
|
// The mesh did not replace the token's secret, so it is still this node's broker
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package link
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"crypto/sha256"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -63,8 +64,15 @@ func presentNats(_ context.Context, to Approach, node, secret string,
|
|||||||
// subscribe its own inbox and nothing else (design 25 §6). The secret is its password, the same
|
// subscribe its own inbox and nothing else (design 25 §6). The secret is its password, the same
|
||||||
// string the request claims, so the server proves somebody holds the token and the request
|
// string the request claims, so the server proves somebody holds the token and the request
|
||||||
// proves the same thing to the controller without it having to ask the server who connected.
|
// proves the same thing to the controller without it having to ask the server who connected.
|
||||||
|
// **Its own inbox space, because that is the only one it may listen in** (novox/hq
|
||||||
|
// 04-ISSUES/146). A JetStream publish waits for the stream's acknowledgement on an inbox the
|
||||||
|
// client picks, and the client's default is `_INBOX.<random>` — which this user may not
|
||||||
|
// subscribe to, so the enrolment failed with a permissions violation on a subject nobody had
|
||||||
|
// chosen. The permission is `_INBOX.enrol.<node>.>` (design 25 §6), so the client is told to
|
||||||
|
// pick its inboxes there; the reply address below is in the same space for the same reason.
|
||||||
conn, err := nats.Connect(natsURL(to.Address),
|
conn, err := nats.Connect(natsURL(to.Address),
|
||||||
nats.Secure(config),
|
nats.Secure(config),
|
||||||
|
nats.CustomInboxPrefix("_INBOX.enrol."+node),
|
||||||
nats.UserInfo("enrol."+node, secret),
|
nats.UserInfo("enrol."+node, secret),
|
||||||
nats.Name("mesh-host/enrol/"+node),
|
nats.Name("mesh-host/enrol/"+node),
|
||||||
nats.Timeout(timeout),
|
nats.Timeout(timeout),
|
||||||
@@ -124,7 +132,19 @@ func (a *natsAsking) Ask(ctx context.Context, request []byte, wait time.Duration
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
// Into the stream and awaited: an enrolment the bus never accepted must fail here rather than be
|
// Into the stream and awaited: an enrolment the bus never accepted must fail here rather than be
|
||||||
// assumed, because the node has nothing else to go on.
|
// assumed, because the node has nothing else to go on.
|
||||||
if _, err := a.js.Publish(EnrolSubject, addressed, nats.Context(publish)); err != nil {
|
//
|
||||||
|
// **Once, however many times it is sent** (novox/hq 04-ISSUES/146). The client re-publishes when
|
||||||
|
// an acknowledgement is slow, and the mesh enrolled the machine on each copy — minting a second
|
||||||
|
// credential, which replaced the first, which is the one the node had already been given. The
|
||||||
|
// machine then reconnected for ever as a user whose password the mesh had rotated out from under
|
||||||
|
// it, and the controller's log said "enrolled anchor" twice in the same second.
|
||||||
|
//
|
||||||
|
// The id is the message: the same bytes carry the same id, so the stream discards the client's
|
||||||
|
// own retry, and a genuine second attempt — which carries a new reply address — is a different
|
||||||
|
// message and is let through.
|
||||||
|
sum := sha256.Sum256(addressed)
|
||||||
|
if _, err := a.js.Publish(EnrolSubject, addressed,
|
||||||
|
nats.MsgId(hex.EncodeToString(sum[:])), nats.Context(publish)); err != nil {
|
||||||
return nil, fmt.Errorf("cannot ask the mesh to enrol this node: %w", err)
|
return nil, fmt.Errorf("cannot ask the mesh to enrol this node: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,46 +0,0 @@
|
|||||||
package link
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
// The count that did not add up was the only symptom sixteen held resources had, and reading it meant
|
|
||||||
// opening the node's state file by hand (novox/hq 04-ISSUES/125). The line that says what an apply did
|
|
||||||
// says what it did not, too.
|
|
||||||
|
|
||||||
func TestTheApplyLineSaysWhatItHeldAndForWhichModule(t *testing.T) {
|
|
||||||
got := heldNote([]Held{
|
|
||||||
{ID: "ca", Module: "route-proxy", Kind: "directory"},
|
|
||||||
{ID: "certs", Module: "route-proxy", Kind: "directory"},
|
|
||||||
{ID: "server", Module: "route-proxy", Kind: "container"},
|
|
||||||
{ID: "mail", Module: "mailu", Kind: "container"},
|
|
||||||
})
|
|
||||||
if !strings.Contains(got, "4 held") {
|
|
||||||
t.Fatalf("the count of what was held is not in the line: %q", got)
|
|
||||||
}
|
|
||||||
// The module is the thing an operator can act on: `take` takes a module.
|
|
||||||
if !strings.Contains(got, "route-proxy: 3") || !strings.Contains(got, "mailu: 1") {
|
|
||||||
t.Fatalf("the line does not break the holds down by module: %q", got)
|
|
||||||
}
|
|
||||||
// Ordered, so two machines holding the same things read the same and a diff of two reports is
|
|
||||||
// about what changed.
|
|
||||||
if strings.Index(got, "mailu") > strings.Index(got, "route-proxy") {
|
|
||||||
t.Fatalf("modules are not in a stated order: %q", got)
|
|
||||||
}
|
|
||||||
// It says why, because "held" alone reads as a failure and this is correct behaviour.
|
|
||||||
if !strings.Contains(got, "taken") {
|
|
||||||
t.Fatalf("the line does not say a hold ends when the module is taken: %q", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAnApplyThatHeldNothingSaysNothingExtra(t *testing.T) {
|
|
||||||
// A converged machine holds nothing, which is most applies. Reporting "0 held" on every one of
|
|
||||||
// them is how a line stops being read.
|
|
||||||
if got := heldNote(nil); got != "" {
|
|
||||||
t.Fatalf("an apply with no holds added %q to its line", got)
|
|
||||||
}
|
|
||||||
if got := heldNote([]Held{}); got != "" {
|
|
||||||
t.Fatalf("an apply with no holds added %q to its line", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-39
@@ -6,8 +6,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -252,11 +250,9 @@ func Run(ctx context.Context, m Membership, apply Applier, say Announce, timeout
|
|||||||
case report.Refused != "":
|
case report.Refused != "":
|
||||||
say("refused a declaration: " + report.Refused)
|
say("refused a declaration: " + report.Refused)
|
||||||
case len(report.Failed) > 0:
|
case len(report.Failed) > 0:
|
||||||
say(fmt.Sprintf("applied %d and failed: %v%s",
|
say(fmt.Sprintf("applied %d and failed: %v", len(report.Applied), report.Failed))
|
||||||
len(report.Applied), report.Failed, heldNote(report.Held)))
|
|
||||||
default:
|
default:
|
||||||
say(fmt.Sprintf("applied %d resource(s)%s",
|
say(fmt.Sprintf("applied %d resource(s)", len(report.Applied)))
|
||||||
len(report.Applied), heldNote(report.Held)))
|
|
||||||
}
|
}
|
||||||
publishReport(ctx, link, m, report, say, timeout)
|
publishReport(ctx, link, m, report, say, timeout)
|
||||||
// Settled after the report is published. A node that dies between applying and
|
// Settled after the report is published. A node that dies between applying and
|
||||||
@@ -396,36 +392,3 @@ func publishAlive(ctx context.Context, bus Bus, m Membership, say Announce,
|
|||||||
say("could not tell the mesh this node is here: " + err.Error())
|
say("could not tell the mesh this node is here: " + err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// heldNote is what this apply did NOT do, for the line that says what it did.
|
|
||||||
//
|
|
||||||
// **A count that does not add up is the only symptom a held resource had** (novox/hq 04-ISSUES/125).
|
|
||||||
// An adopted node keeps what it found until its module is taken (ADR 0100), and that is correct — but
|
|
||||||
// it was recorded only in the node's own state file. On the edge cut-over the mesh sent 346 resources,
|
|
||||||
// the journal said it applied 330, and nothing anywhere said which sixteen or why. Reading it took
|
|
||||||
// opening state.json by hand; not reading it took every public name on the machine down, because the
|
|
||||||
// operator had four green surfaces and a discrepancy nobody could interpret.
|
|
||||||
//
|
|
||||||
// So the line that reports the apply carries it. Grouped by module and ordered by name, because the
|
|
||||||
// sentence an operator needs is "route-proxy is assigned and not taken", and the module is the thing
|
|
||||||
// they can act on — `take` is the verb, and it takes a module.
|
|
||||||
func heldNote(held []Held) string {
|
|
||||||
if len(held) == 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
byModule := map[string]int{}
|
|
||||||
for _, h := range held {
|
|
||||||
byModule[h.Module]++
|
|
||||||
}
|
|
||||||
names := make([]string, 0, len(byModule))
|
|
||||||
for name := range byModule {
|
|
||||||
names = append(names, name)
|
|
||||||
}
|
|
||||||
sort.Strings(names)
|
|
||||||
parts := make([]string, 0, len(names))
|
|
||||||
for _, name := range names {
|
|
||||||
parts = append(parts, fmt.Sprintf("%s: %d", name, byModule[name]))
|
|
||||||
}
|
|
||||||
return fmt.Sprintf(", %d held until their module is taken (%s)",
|
|
||||||
len(held), strings.Join(parts, ", "))
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user