reyk/cloud-agent
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

user-data is not always base64-encoded.

Browse source
This commit is contained in:
reykfloeter 2018-05-08 12:08:58 +02:00
parent f48b2bc2b9
commit 5de42d6464
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
agent/main.c
View file

@ -493,8 +493,6 @@ agent_configure(struct system_config *sc)
{ {
struct ssh_pubkey *ssh; struct ssh_pubkey *ssh;
char *str1, *str2; char *str1, *str2;
unsigned char *userdata;
size_t len;
/* Skip configuration on the same instance */ /* Skip configuration on the same instance */
if ((str1 = filein("r", "/var/db/cloud-instance")) != NULL) { if ((str1 = filein("r", "/var/db/cloud-instance")) != NULL) {
@ -572,18 +570,9 @@ agent_configure(struct system_config *sc)
} }
if (sc->sc_userdata) { if (sc->sc_userdata) {
/* if (agent_userdata(sc->sc_userdata,
* The decoded base64 string is smaller than the strlen(sc->sc_userdata)) != 0)
* userdata; it is safe to allocate the same length. log_warnx("user-data failed");
*/
len = strlen(sc->sc_userdata);
if ((userdata = calloc(1, len + 1)) == NULL)
log_warnx("failed to allocate user-data");
else if ((len = b64_pton(sc->sc_userdata, userdata, len)) < 1)
log_warnx("failed to decode user-data");
else
(void)agent_userdata(userdata, len);
free(userdata);
} }
log_debug("%s: %s", __func__, "/etc/rc.firsttime"); log_debug("%s: %s", __func__, "/etc/rc.firsttime");
@ -608,12 +597,30 @@ agent_userdata(const unsigned char *userdata, size_t len)
const char *file; const char *file;
int ret = -1; int ret = -1;
/* XXX add support for gzip-encoded user-data */ if (len <= 2) {
if ((shebang = get_line(userdata, len)) == NULL) { log_warnx("user-data too short");
log_warnx("failed to decode shebang from user-data");
goto fail; goto fail;
} }
if (userdata[0] == 0x1f && userdata[1] == 0x8b) {
log_warnx("gzip-compressed user-data is not supported");
goto fail;
} else if (userdata[0] == '#') {
if ((shebang = get_line(userdata, len)) == NULL) {
log_warnx("failed to decode shebang from user-data");
goto fail;
}
} else if (isprint(userdata[0]) && isprint(userdata[1])) {
/* Decode user-data and call the function again */
if ((str = calloc(1, len + 1)) == NULL ||
(len = b64_pton(userdata, str, len)) < 1 ||
agent_userdata(str, len) != 0) {
log_warnx("failed to decode user-data");
goto fail;
}
goto done;
}
log_debug("%s: user-data: %s", __func__, shebang); log_debug("%s: user-data: %s", __func__, shebang);
if (strlen(shebang) <= 2 || strncmp("#!", shebang, 2) != 0) { if (strlen(shebang) <= 2 || strncmp("#!", shebang, 2) != 0) {
@ -641,6 +648,7 @@ agent_userdata(const unsigned char *userdata, size_t len)
fileout(line, "a", "/etc/rc.firsttime") != 0) fileout(line, "a", "/etc/rc.firsttime") != 0)
log_warnx("failed to add user-data script"); log_warnx("failed to add user-data script");
done:
ret = 0; ret = 0;
fail: fail:
free(line); free(line);