From nobody Sat Jun 6 06:14:19 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gXSgb597gz6g539 for ; Sat, 06 Jun 2026 06:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gXSgb214wz3SwG for ; Sat, 06 Jun 2026 06:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780726459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Qe3MudVsc0Mhy0sQH8XDMKhZubG0fZCVRn++y3g4dY=; b=XLHxH3r/2AM49Bc0FsQnBHHcxZIldeYuIvJ2gysijy3k4iLBZ1H//luVh+eIlqobRVgPpz xPWOMwsY+2GCPRBDgHt0/uzEB0G8Bvg9ze18TDehNJcaytoFQ6BAMZlu6FG9/rMauiqSJa bM7NFvr7KTMscnCtjmTO5KAepGT9dmq875hB+a66cnEj2lvKHeF3p6cmdMZJHWgKq3H/ux JffZTRMCxPwfPFHB8r+f8jEvFNV/hfuUKDGBipb27rzPH3B5AWlnSiLeAtIai+Die7s8e6 ZG5fQPaKHNU+G7KQq2ygFr9itgzKGHXTkb5d4fIIoKgwo2Va4UBdjbwTvdqx7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780726459; a=rsa-sha256; cv=none; b=FlS2pQfO3fefmQ2JO3UHVpM4zSZQdqgj+6gyieuGmO/xXTpot83S+w6LNwWDYlzjdmGyiM qb+FGLxS3ZOZLj82vrQoSyE/L4g2/yTo17WgQsOl0imIAAw0C5Uj53nkTqCNLGbxc5wP7E 5lghutCzi+uxVIc+ojf9XKmPT2vsa/AqRLKPL0fyX3hpJesOilsbzfZa6gr4amex6oldNa /w2jUGJkSl+iGNKEBb2D/lMGxw30P+MH6WVDJELZNxWg7f5N+6xMK9k2IFsD/BdtI/l52/ KAnVHgzjE49TQhzUF1RX653RziifmdSUtvcn/fX5eBFLHzdFkvVU1GB62H6t9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780726459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Qe3MudVsc0Mhy0sQH8XDMKhZubG0fZCVRn++y3g4dY=; b=sAXOSGLTmWf3I80Ui0jn2djstO+luwjN2BtPaLYdhwYj+b8uMKnAIy2dwQNIFgZYLPYeNf FqsG6xcYxqh54LstZieOFGZCdiGQgT/lVe+5AbOmezaJhlzmYc1cXVCY6IdMVikTZyzE88 2GdL2RCWUvUaa1A7ZcEuTGsBYsRWMXmHcGT8AuaG1ZwjBxioyfePInVeboJANMKrvYuS0/ 6m/egRdLEMp2BpoTI/V15v8wkcrpxjGn0hwfvLKj1ZmWlUYwDmf2r8W2+hOuPd83gXMY+k cHlYUn3TwYl7ruFZZb+Xu49UiMG3iw7QwvLubn4GdQ/lcWm/ILI5GkmmGhfqMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gXSgb1cMrz13ZW for ; Sat, 06 Jun 2026 06:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Jun 2026 06:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 71e8122b3f6e - main - nuage.lua: add encode_base64 helper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71e8122b3f6efdaac23ac219312dfe270731b495 Auto-Submitted: auto-generated Date: Sat, 06 Jun 2026 06:14:19 +0000 Message-Id: <6a23babb.30d82.4b09da57@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=71e8122b3f6efdaac23ac219312dfe270731b495 commit 71e8122b3f6efdaac23ac219312dfe270731b495 Author: Baptiste Daroussin AuthorDate: 2026-05-07 21:53:04 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-06 06:01:48 +0000 nuage.lua: add encode_base64 helper --- libexec/nuageinit/nuage.lua | 30 ++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuageinit.sh | 20 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 6cef5d2dd904..3f614dba2b22 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -55,6 +55,35 @@ local function decode_base64(input) return table.concat(result) end +local function encode_base64(input) + if input == nil or #input == 0 then + return "" + end + local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' + local result = {} + local pos = 1 + local padding = "" + while pos <= #input do + local a = string.byte(input, pos) + local bb = pos + 1 <= #input and string.byte(input, pos + 1) or 0 + local c = pos + 2 <= #input and string.byte(input, pos + 2) or 0 + table.insert(result, string.sub(b, math.floor(a / 4) + 1, math.floor(a / 4) + 1)) + table.insert(result, string.sub(b, math.floor(a % 4 * 16 + bb / 16) + 1, math.floor(a % 4 * 16 + bb / 16) + 1)) + if pos + 1 <= #input then + table.insert(result, string.sub(b, math.floor(bb % 16 * 4 + c / 64) + 1, math.floor(bb % 16 * 4 + c / 64) + 1)) + else + table.insert(result, "=") + end + if pos + 2 <= #input then + table.insert(result, string.sub(b, math.floor(c % 64) + 1, math.floor(c % 64) + 1)) + else + table.insert(result, "=") + end + pos = pos + 3 + end + return table.concat(result) +end + local function shell_escape(s) return "'" .. string.gsub(s, "'", "'\\''") .. "'" end @@ -964,6 +993,7 @@ local n = { addsudo = addsudo, adddoas = adddoas, addfile = addfile, + encode_base64 = encode_base64, add_fstab_entry = add_fstab_entry, remove_fstab_entry = remove_fstab_entry, write_resolv_conf = write_resolv_conf, diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 21cd2e8f17c5..c3c75949da65 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -45,6 +45,7 @@ atf_test_case config2_userdata_power_state atf_test_case config2_userdata_locale atf_test_case config2_userdata_fqdn_and_hostname atf_test_case config2_userdata_write_files +atf_test_case config2_userdata_encode_base64 setup_test_adduser() { @@ -1382,6 +1383,24 @@ EOF atf_check -o inline:"hostname=\"host\"\n" cat ${PWD}/etc/rc.conf.d/hostname } +config2_userdata_encode_base64_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + atf_check -o inline:"dGVzdA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('test'))" + atf_check -o inline:"dA==\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('t'))" + atf_check -o inline:"dGU=\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64('te'))" + # Roundtrip test + atf_check -o inline:"hello world\n" \ + /usr/libexec/flua -e "print(require('nuage').decode_base64(require('nuage').encode_base64('hello world')))" + # Empty input + atf_check -o inline:"\n" \ + /usr/libexec/flua -e "print(require('nuage').encode_base64(''))" +} + atf_init_test_cases() { atf_add_test_case args @@ -1422,4 +1441,5 @@ atf_init_test_cases() atf_add_test_case config2_userdata_locale atf_add_test_case config2_userdata_fqdn_and_hostname atf_add_test_case config2_userdata_write_files + atf_add_test_case config2_userdata_encode_base64 }