summaryrefslogtreecommitdiff
path: root/hscript
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-31 20:38:27 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-31 20:38:27 -0500
commit7ab44372d81e86df99b3aefa114a5003df98bc61 (patch)
treea376b212f73518f7633925bf77d403fc33792953 /hscript
parentbc96edb1c20b0031479cbf23055651c2c92f7afe (diff)
downloadhorizon-7ab44372d81e86df99b3aefa114a5003df98bc61.tar.gz
horizon-7ab44372d81e86df99b3aefa114a5003df98bc61.tar.bz2
horizon-7ab44372d81e86df99b3aefa114a5003df98bc61.tar.xz
horizon-7ab44372d81e86df99b3aefa114a5003df98bc61.zip
hscript: Implement SigningKey, add tests
Diffstat (limited to 'hscript')
-rw-r--r--hscript/meta.cc21
-rw-r--r--hscript/meta.hh9
-rw-r--r--hscript/script.cc18
3 files changed, 46 insertions, 2 deletions
diff --git a/hscript/meta.cc b/hscript/meta.cc
index 5885c1e..640743c 100644
--- a/hscript/meta.cc
+++ b/hscript/meta.cc
@@ -466,3 +466,24 @@ bool Repository::execute(ScriptOptions opts) const {
return false;
#endif /* HAS_INSTALL_ENV */
}
+
+
+Key *SigningKey::parseFromData(const std::string &data, int lineno,
+ int *errors, int *) {
+ if(data.empty() || (data[0] != '/' && data.compare(0, 8, "https://"))) {
+ if(errors) *errors += 1;
+ output_error("installfile:" + std::to_string(lineno),
+ "signingkey: must be absolute path or HTTPS URL");
+ return nullptr;
+ }
+
+ return new SigningKey(lineno, data);
+}
+
+bool SigningKey::validate(ScriptOptions) const {
+ return true;
+}
+
+bool SigningKey::execute(ScriptOptions) const {
+ return false;
+}
diff --git a/hscript/meta.hh b/hscript/meta.hh
index dad4cf3..547349d 100644
--- a/hscript/meta.hh
+++ b/hscript/meta.hh
@@ -88,7 +88,14 @@ public:
bool execute(ScriptOptions) const override;
};
-class SigningKey : public Key {
+class SigningKey : public StringKey {
+private:
+ SigningKey(int _line, const std::string &_path) :
+ StringKey(_line, _path) {}
+public:
+ static Key *parseFromData(const std::string &, int, int *, int *);
+ bool validate(ScriptOptions) const override;
+ bool execute(ScriptOptions) const override;
};
}
diff --git a/hscript/script.cc b/hscript/script.cc
index 319ba14..ea083a8 100644
--- a/hscript/script.cc
+++ b/hscript/script.cc
@@ -173,6 +173,10 @@ struct Script::ScriptPrivate {
std::unique_ptr<Repository> repo(dynamic_cast<Repository *>(obj));
this->repos.push_back(std::move(repo));
return true;
+ } else if(key_name == "signingkey") {
+ std::unique_ptr<SigningKey> key(dynamic_cast<SigningKey *>(obj));
+ this->repo_keys.push_back(std::move(key));
+ return true;
} else if(key_name == "username") {
return store_username(obj, lineno, errors, warnings, opts);
} else if(key_name == "useralias") {
@@ -808,7 +812,19 @@ bool Script::validate() const {
"You may only specify up to 10 repositories.");
}
- /* signingkey */
+ /* REQ: Runner.Validate.signingkey */
+ for(auto &key : this->internal->repo_keys) {
+ if(!key->validate(this->opts)) {
+ failures++;
+ }
+ }
+ if(this->internal->repo_keys.size() > 10) {
+ failures++;
+ output_error("installfile:" +
+ std::to_string(this->internal->repo_keys[11]->lineno()),
+ "signingkey: too many keys specified",
+ "You may only specify up to 10 repository keys.");
+ }
for(auto &acct : this->internal->accounts) {
UserDetail *detail = acct.second.get();