aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-04-19 18:05:31 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-04-19 18:05:31 +0300
commit96307738008591afe220cc9feab309e42c20411b (patch)
treeb1c01b3844b1cebb9e3971be6622268bf6e2423d
parentf5b11ba042f96905d15b16b4127b65cb639d2ff8 (diff)
Adapt to challenge and fingerprint manifest values being optional now
-rw-r--r--bbot/agent.cxx4
-rw-r--r--doc/manual.cli5
2 files changed, 6 insertions, 3 deletions
diff --git a/bbot/agent.cxx b/bbot/agent.cxx
index 2df96e6..b926908 100644
--- a/bbot/agent.cxx
+++ b/bbot/agent.cxx
@@ -839,7 +839,7 @@ try
//
// @@ TODO: key fingerprint.
//
- task_request_manifest tq {hname, "", machine_header_manifests {}};
+ task_request_manifest tq {hname, nullopt, machine_header_manifests {}};
for (const bootstrapped_machine_manifest& m: ms)
tq.machines.emplace_back (m.machine.id,
@@ -977,7 +977,7 @@ try
//
// @@ TODO challange
//
- result_request_manifest rq {tr.session, "", move (r)};
+ result_request_manifest rq {tr.session, nullopt, move (r)};
{
const string& u (*tr.result_url);
diff --git a/doc/manual.cli b/doc/manual.cli
index b96ddd9..505585b 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -410,7 +410,9 @@ starts with the task request manifest followed by a list of machine manifests.
\li|\n\c{fingerprint: <agent-fingerprint>}\n
- The SHA256 fingerprint of the agent's public key.||
+ The SHA256 fingerprint of the agent's public key. If not present, and
+ the controller is configured to require it, then it responds with the
+ \c{unauthorized} (401) HTTP status code.||
\h#arch-task-res-manifest|Task Response Manifest|
@@ -475,6 +477,7 @@ result response and only a successful but empty POST result is returned.
\li|\n\c{challenge: <text>}\n
The answer to the private key challenge as posed by the controller in the
+ task response. Must present only if the challenge value was present in the
task response.||