Skip to content

Keep empty files unencrypted #162

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Keep empty files unencrypted #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17a9020
Keep empty files unencrypted
hugopeixoto Oct 29, 2018
0d04af2
Use a setting to toggle encryption of empty files
hugopeixoto Aug 17, 2020
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
58 changes: 58 additions & 0 deletions commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,52 @@ static std::string get_path_to_top ()
return path_to_top;
}

static std::string git_crypt_config (const std::string& key, const std::string& type, const std::string& default_value)
{
std::vector<std::string> command;
command.push_back("git");
command.push_back("config");
command.push_back("--file");
command.push_back(get_repo_state_path() + "/config");
command.push_back("--type");
command.push_back(type);
command.push_back("--default");
command.push_back(default_value);
command.push_back("--get");
command.push_back(key);

std::stringstream output;
if (!successful_exit(exec_command(command, output))) {
throw Error("'git config' failed - is Git installed?");
}

std::string word;
output >> word;
return word;
}

static void git_crypt_set_config (const std::string& name, const std::string& value)
{
std::vector<std::string> command;
command.push_back("git");
command.push_back("config");
command.push_back("--file");
command.push_back(get_repo_state_path() + "/config");
command.push_back("--replace-all");
command.push_back(name);
command.push_back(value);

if (!successful_exit(exec_command(command))) {
throw Error("'git config' failed - is Git installed?");
}
}

static bool git_config_encrypt_empty_files ()
{
return git_crypt_config("git-crypt.encrypt-empty-files", "bool", "false") == "true";
}


static void get_git_status (std::ostream& output)
{
// git status -uno --porcelain
Expand Down Expand Up @@ -770,6 +816,10 @@ int clean (int argc, const char** argv)
return 1;
}

if (file_size == 0 && !git_config_encrypt_empty_files()) {
return 0;
}

// We use an HMAC of the file as the encryption nonce (IV) for CTR mode.
// By using a hash of the file we ensure that the encryption is
// deterministic so git doesn't think the file has changed when it really
Expand Down Expand Up @@ -887,6 +937,11 @@ int smudge (int argc, const char** argv)
// Read the header to get the nonce and make sure it's actually encrypted
unsigned char header[10 + Aes_ctr_decryptor::NONCE_LEN];
std::cin.read(reinterpret_cast<char*>(header), sizeof(header));

if (std::cin.gcount() == 0 && !git_config_encrypt_empty_files()) {
return 0;
}

if (std::cin.gcount() != sizeof(header) || std::memcmp(header, "\0GITCRYPT\0", 10) != 0) {
// File not encrypted - just copy it out to stdout
std::clog << "git-crypt: Warning: file not encrypted" << std::endl;
Expand Down Expand Up @@ -1002,6 +1057,9 @@ int init (int argc, const char** argv)
// 2. Configure git for git-crypt
configure_git_filters(key_name);

// 3. Set default options
git_crypt_set_config("git-crypt.encrypt-empty-files", "false");

return 0;
}

Expand Down