Skip to content

Fix #4 and enable codesign to interoperate with qemu-upstream's entitlement.sh script. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thefloweringash merged 2 commits into from
Sep 6, 2021
Merged

Fix #4 and enable codesign to interoperate with qemu-upstream's entitlement.sh script. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e98de5
codesign: allow --force as a synonym for -f
mstone Sep 2, 2021
13072a4
codesign: use mkstemp() filename output to drive codesign_allocate
mstone Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codesign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ int main(int argc, char **argv) {
std::vector<std::string> files;
app.add_option("-s", identity, "Code signing identity")->required();
app.add_option("-i,--identifier", identifier, "File identifier");
app.add_flag("-f", force, "Replace any existing signatures");
app.add_flag("-f,--force", force, "Replace any existing signatures");
app.add_option("--entitlements", entitlements, "Entitlements plist");
app.add_option("files", files, "Files to sign");

Expand Down
18 changes: 11 additions & 7 deletions commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ int Commands::codesign(const CodesignOptions &options, const std::string &filena
}

// Make temporary name
char *tempfileName = strdup((filename + "XXXXXX").c_str());
int tempfile = mkstemp(tempfileName);
std::unique_ptr<char, decltype(&std::free)> tempfileName { strdup((filename + "XXXXXX").c_str()), std::free };
int tempfile = mkstemp(tempfileName.get());

// Preserve mode
struct stat sourceFileStat{};
Expand All @@ -287,9 +287,8 @@ int Commands::codesign(const CodesignOptions &options, const std::string &filena
throw std::runtime_error{"chmod temporary file"};
}

std::string tempfileFdPath = std::string{"/dev/fd/"} + std::to_string(tempfile);
arguments.emplace_back("-o");
arguments.emplace_back(tempfileFdPath);
arguments.emplace_back(std::string(tempfileName.get()));

// codesign_allocate
pid_t pid;
Expand All @@ -306,11 +305,16 @@ int Commands::codesign(const CodesignOptions &options, const std::string &filena
};

int codesign_status;
if (waitpid(pid, &codesign_status, 0) <= 0) {
pid_t waitpid_result;
do {
waitpid_result = waitpid(pid, &codesign_status, 0);
} while (waitpid_result == -1 && errno == EINTR);
if (waitpid_result == -1) {
throw std::runtime_error{
std::string{"codesign waitpid failed: "} + strerror(errno)
};
}

freeArgs(spawnArgs, arguments.size());

if (!WIFEXITED(codesign_status) || WEXITSTATUS(codesign_status) != 0) {
Expand All @@ -323,13 +327,13 @@ int Commands::codesign(const CodesignOptions &options, const std::string &filena

// inject
Commands::inject(SignOptions{
.filename = tempfileName,
.filename = std::string(tempfileName.get()),
.identifier = identifier,
.entitlements = options.entitlements,
});

// rename temp file to output
if (rename(tempfileName, filename.c_str()) != 0) {
if (rename(tempfileName.get(), filename.c_str()) != 0) {
throw std::runtime_error{"rename failed"};
}

Expand Down