summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Odvody <podvody@redhat.com>2015-05-19 16:29:29 +0200
committerLennart Poettering <lennart@poettering.net>2015-05-19 18:21:46 +0200
commit74eff91e5f118224c1e556d2716d5360dd97a87d (patch)
tree3670882a05762c865c82f1561b4a70cc3cc3e5bb
parentc6497ccb7153af9a1252c48918e380b5134314de (diff)
shared/import-util: Tag renamed to reference
Added (sha256) digest validation function
-rw-r--r--src/shared/import-util.c21
-rw-r--r--src/shared/import-util.h2
2 files changed, 23 insertions, 0 deletions
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index 660d92ac5d..001a8a37e8 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -150,6 +150,27 @@ int raw_strip_suffixes(const char *p, char **ret) {
return 0;
}
+bool dkr_digest_is_valid(const char *digest) {
+ /* 7 chars for prefix, 64 chars for the digest itself */
+ if (strlen(digest) != 71)
+ return false;
+
+ return startswith(digest, "sha256:") && in_charset(digest + 7, "0123456789abcdef");
+}
+
+bool dkr_ref_is_valid(const char *ref) {
+ const char *colon;
+
+ if (isempty(ref))
+ return false;
+
+ colon = strchr(ref, ':');
+ if (!colon)
+ return filename_is_valid(ref);
+
+ return dkr_digest_is_valid(ref);
+}
+
bool dkr_name_is_valid(const char *name) {
const char *slash, *p;
diff --git a/src/shared/import-util.h b/src/shared/import-util.h
index ff155b0ff2..7bf7d4ca40 100644
--- a/src/shared/import-util.h
+++ b/src/shared/import-util.h
@@ -44,4 +44,6 @@ int raw_strip_suffixes(const char *name, char **ret);
bool dkr_name_is_valid(const char *name);
bool dkr_id_is_valid(const char *id);
+bool dkr_ref_is_valid(const char *ref);
+bool dkr_digest_is_valid(const char *digest);
#define dkr_tag_is_valid(tag) filename_is_valid(tag)