From 16f303d2606af82c98d292e0d00943e64b6170cb Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 3 Aug 2023 14:44:07 -0500 Subject: [PATCH] initial commit Signed-off-by: jolheiser --- .git-age.yaml | 4 + .gitattributes | 2 + .gitignore | 1 + .goreleaser.yaml | 25 +++ .woodpecker/goreleaser.yml | 38 ++++ LICENSE | 373 +++++++++++++++++++++++++++++++++++++ README.md | 9 + cmd/clean.go | 115 ++++++++++++ cmd/cmd.go | 148 +++++++++++++++ cmd/config.go | 46 +++++ cmd/identity.go | 106 +++++++++++ cmd/init.go | 91 +++++++++ cmd/smudge.go | 63 +++++++ cmd/textconv.go | 56 ++++++ go.mod | 20 ++ go.sum | 25 +++ key.txt | 3 + main.go | 15 ++ secrets/age.txt | 5 + secrets/ssh.txt | 5 + ssh | 7 + ssh.pub | 1 + 22 files changed, 1158 insertions(+) create mode 100644 .git-age.yaml create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .goreleaser.yaml create mode 100644 .woodpecker/goreleaser.yml create mode 100644 LICENSE create mode 100644 README.md create mode 100644 cmd/clean.go create mode 100644 cmd/cmd.go create mode 100644 cmd/config.go create mode 100644 cmd/identity.go create mode 100644 cmd/init.go create mode 100644 cmd/smudge.go create mode 100644 cmd/textconv.go create mode 100644 go.mod create mode 100644 go.sum create mode 100644 key.txt create mode 100644 main.go create mode 100644 secrets/age.txt create mode 100644 secrets/ssh.txt create mode 100644 ssh create mode 100644 ssh.pub diff --git a/.git-age.yaml b/.git-age.yaml new file mode 100644 index 0000000..3defe8c --- /dev/null +++ b/.git-age.yaml @@ -0,0 +1,4 @@ +"secrets/age.txt": + - age13nf8wry2lzyy0wtzq9qz0hkm2xumez074nuu0qwe8l0vsell2s2s6rgqch +"secrets/ssh.txt": + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6qVlew2gb+lb1f/9+XgHM4oy8wRlahFpm17Ul3ln9I git-age diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9ac8787 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +secrets/** filter=git-age diff=git-age + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ba2da87 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/git-age* diff --git a/.goreleaser.yaml b/.goreleaser.yaml new file mode 100644 index 0000000..59501cd --- /dev/null +++ b/.goreleaser.yaml @@ -0,0 +1,25 @@ +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + ldflags: + - "-s -w -X go.jolheiser.com/git-age/cmd.version={{.Version}}" +archives: + - replacements: + 386: i386 + amd64: x86_64 + format_overrides: + - goos: windows + format: zip +checksum: + name_template: 'checksums.txt' +release: + gitea: + owner: jolheiser + name: git-age +gitea_urls: + api: https://git.jojodev.com/api/v1/ + download: https://git.jojodev.com diff --git a/.woodpecker/goreleaser.yml b/.woodpecker/goreleaser.yml new file mode 100644 index 0000000..cfeef80 --- /dev/null +++ b/.woodpecker/goreleaser.yml @@ -0,0 +1,38 @@ +clone: + git: + image: woodpeckerci/plugin-git + settings: + tags: true + +pipeline: + compliance: + image: golang:1.18 + commands: + - go test -race ./... + - go vet ./... + when: + event: pull_request + + build: + image: goreleaser/goreleaser + commands: + - goreleaser build --snapshot + when: + event: pull_request + + release: + image: goreleaser/goreleaser + commands: + - goreleaser release + secrets: [ gitea_token ] + when: + event: tag + + prune: + image: jolheiser/drone-gitea-prune + settings: + base: https://git.jojodev.com + token: + from_secret: gitea_token + when: + event: tag diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a612ad9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/README.md b/README.md new file mode 100644 index 0000000..ba044d4 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# git-age + +This is a Go port of [git-agecrypt](https://github.com/vlaci/git-agecrypt) with some slight modifications. + +## License + +This software was written based off of [git-agecrypt](https://github.com/vlaci/git-agecrypt/tree/945b80556d8848f6e85a8cc0053f9020bdc8b359). + +[MPL-2.0](LICENSE) ([Original](https://github.com/vlaci/git-agecrypt/blob/945b80556d8848f6e85a8cc0053f9020bdc8b359/LICENSE)) diff --git a/cmd/clean.go b/cmd/clean.go new file mode 100644 index 0000000..f001ad9 --- /dev/null +++ b/cmd/clean.go @@ -0,0 +1,115 @@ +package cmd + +import ( + "bytes" + "fmt" + "io" + "os" + "path/filepath" + "strings" + + "filippo.io/age" + "github.com/urfave/cli/v2" + "lukechampine.com/blake3" +) + +var Clean = &cli.Command{ + Name: "clean", + Aliases: []string{"c"}, + Description: "Git clean filter", + Hidden: true, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "file", + Usage: "File being worked on", + Aliases: []string{"f"}, + }, + }, + Action: actionClean, +} + +func actionClean(ctx *cli.Context) error { + recipients, err := ageRecipients(ctx.String("file")) + if err != nil { + return err + } + + dir, err := gitConfigDir(ctx.String("file")) + if err != nil { + return err + } + existing, err := os.ReadFile(filepath.Join(dir, "blake3")) + if err != nil { + // File doesn't exist + } + + var stdin bytes.Buffer + hasher := blake3.New(64, nil) + hasherTee := io.TeeReader(os.Stdin, hasher) + if _, err := io.Copy(&stdin, hasherTee); err != nil { + return err + } + + sum := hasher.Sum(nil) + if fmt.Sprintf("%x", existing) == fmt.Sprintf("%x", sum) { + saved, err := os.ReadFile(filepath.Join(dir, "age")) + if err != nil { + return err + } + os.Stdout.Write(saved) + return nil + } + + hashFile, err := os.Create(filepath.Join(dir, "blake3")) + if err != nil { + return err + } + hashFile.Write(sum) + defer hashFile.Close() + ageFile, err := os.Create(filepath.Join(dir, "age")) + if err != nil { + return err + } + defer ageFile.Close() + + headDecrypted, headEncrypted, err := headContents(ctx.String("file")) + if err != nil { + return err + } + if string(headDecrypted) == stdin.String() { + ageFile.Write(headEncrypted) + os.Stdout.Write(headEncrypted) + return nil + } + + mw := io.MultiWriter(ageFile, os.Stdout) + wc, err := age.Encrypt(mw, recipients...) + if err != nil { + return err + } + if _, err := io.Copy(wc, &stdin); err != nil { + return err + } + + return wc.Close() +} + +func headContents(file string) ([]byte, []byte, error) { + out, err := cmd("git", "cat-file", "blob", fmt.Sprintf("HEAD:%s", file)) + if err != nil { + return nil, nil, nil + } + + identities, err := ageIdentities() + if err != nil { + return nil, nil, err + } + + r, err := age.Decrypt(strings.NewReader(out), identities...) + if err != nil { + return nil, nil, err + } + + decrypted, err := io.ReadAll(r) + return decrypted, []byte(out), err +} diff --git a/cmd/cmd.go b/cmd/cmd.go new file mode 100644 index 0000000..b747ca3 --- /dev/null +++ b/cmd/cmd.go @@ -0,0 +1,148 @@ +package cmd + +import ( + "bytes" + "errors" + "fmt" + "io" + "os" + "os/exec" + "path/filepath" + "strings" + + "filippo.io/age" + "filippo.io/age/agessh" + "github.com/urfave/cli/v2" +) + +var ( + version = "develop" + debug = false +) + +func New() *cli.App { + app := cli.NewApp() + app.Name = "git-age" + app.Version = version + app.Usage = "Git encryption using age" + app.Commands = []*cli.Command{ + Clean, + Identity, + Init, + Smudge, + TextConv, + } + app.Flags = []cli.Flag{ + &cli.BoolFlag{ + Name: "debug", + Aliases: []string{"d"}, + Usage: "Debug mode", + Destination: &debug, + }, + } + return app +} + +func parseIdentityFile(file string) ([]age.Identity, error) { + fi, err := os.Open(file) + if err != nil { + return nil, err + } + defer fi.Close() + + // First try age + i, err := age.ParseIdentities(fi) + if err != nil { + if debug { + fmt.Fprintf(os.Stderr, "could not parse %q as age identities, trying ssh next: %v\n", file, err) + } + ageErr := err + + // Fall back to ssh + fi.Seek(0, 0) + content, err := io.ReadAll(fi) + if err != nil { + return nil, err + } + si, err := agessh.ParseIdentity(content) + if err != nil { + return nil, fmt.Errorf("could not parse identity file: age -> %w, ssh -> %w", ageErr, err) + } + i = []age.Identity{si} + } + return i, nil +} + +func ageRecipients(file string) ([]age.Recipient, error) { + cfg, err := LoadConfig() + if err != nil { + return nil, err + } + val, ok := cfg[file] + if !ok { + return nil, fmt.Errorf("no config found for %q", file) + } + return val.Recipients() +} + +var ErrNoIdentities = errors.New("no identities found") + +func listIdentities() ([]string, error) { + out, err := cmd("git", "config", "--get-all", "git-age.identity") + if err != nil { + if out == "" { + return nil, ErrNoIdentities + } + return nil, err + } + return strings.Fields(out), nil +} + +func ageIdentities() ([]age.Identity, error) { + keyFiles, err := listIdentities() + if err != nil { + return nil, err + } + + var identities []age.Identity + for _, keyFile := range keyFiles { + i, err := parseIdentityFile(keyFile) + if err != nil { + return identities, err + } + identities = append(identities, i...) + } + return identities, nil +} + +func gitBaseDir() (string, error) { + out, err := cmd("git", "rev-parse", "--show-toplevel") + if err != nil { + return "", err + } + stdout := strings.TrimSpace(string(out)) + return stdout, nil +} + +func gitConfigDir(file string) (string, error) { + stdout, err := gitBaseDir() + if err != nil { + return "", err + } + normalFile := strings.ReplaceAll(file, string(filepath.Separator), "!") + dir := filepath.Join(stdout, ".git", "git-age", normalFile) + return dir, os.MkdirAll(dir, os.ModePerm) +} + +func cmd(command string, args ...string) (string, error) { + var stdout bytes.Buffer + c := exec.Command(command, args...) + c.Stdout = &stdout + if debug { + c.Stderr = os.Stderr + } + if err := c.Run(); err != nil { + return "", err + } + return stdout.String(), nil +} diff --git a/cmd/config.go b/cmd/config.go new file mode 100644 index 0000000..28ca95c --- /dev/null +++ b/cmd/config.go @@ -0,0 +1,46 @@ +package cmd + +import ( + "fmt" + "os" + + "filippo.io/age" + "filippo.io/age/agessh" + "gopkg.in/yaml.v3" +) + +// Config is the configuration for git-age +type Config map[string]Recipients + +type Recipients []string + +// Recipients parses age recipients from recipient strings +func (r Recipients) Recipients() ([]age.Recipient, error) { + var recipients []age.Recipient + for _, rstr := range r { + var rec age.Recipient + rec, err := age.ParseX25519Recipient(rstr) + if err != nil { + if debug { + fmt.Fprintf(os.Stderr, "could not parse recipient %q with age, trying ssh next: %v\n", rstr, err) + } + rec, err = agessh.ParseRecipient(rstr) + if err != nil { + return recipients, err + } + } + recipients = append(recipients, rec) + } + return recipients, nil +} + +// LoadConfig decodes .git-age.yaml into an AgeConfig +func LoadConfig() (Config, error) { + var cfg Config + fi, err := os.Open(".git-age.yaml") + if err != nil { + return cfg, err + } + defer fi.Close() + return cfg, yaml.NewDecoder(fi).Decode(&cfg) +} diff --git a/cmd/identity.go b/cmd/identity.go new file mode 100644 index 0000000..39937be --- /dev/null +++ b/cmd/identity.go @@ -0,0 +1,106 @@ +package cmd + +import ( + "errors" + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/urfave/cli/v2" +) + +var Identity = &cli.Command{ + Name: "identity", + Aliases: []string{"i", "ident"}, + Description: "Manage identity files", + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "remove", + Aliases: []string{"r"}, + Usage: "Remove an identity file", + }, + &cli.BoolFlag{ + Name: "list", + Aliases: []string{"l"}, + Usage: "List identity files", + }, + }, + + Action: actionIdentity, +} + +func actionIdentity(ctx *cli.Context) error { + keyFiles, err := listIdentities() + if err != nil && !errors.Is(err, ErrNoIdentities) { + return err + } + + if ctx.Bool("list") { + return actionListIdentities(ctx, keyFiles) + } + + if ctx.NArg() != 1 { + return errors.New("identity requires 1 argument") + } + + file := ctx.Args().First() + if strings.HasPrefix(file, "~") { + home, err := os.UserHomeDir() + if err != nil { + return err + } + file = filepath.Join(home, strings.TrimPrefix(file, "~")) + } + file = os.ExpandEnv(file) + file, err = filepath.Abs(file) + if err != nil { + return err + } + + exists := -1 + for idx, keyFile := range keyFiles { + if file == keyFile { + exists = idx + break + } + } + + if exists >= 0 && !ctx.Bool("remove") { + return fmt.Errorf("identity file %q already exists", file) + } else if exists == -1 && ctx.Bool("remove") { + return fmt.Errorf("identity file %q doesn't exist", file) + } + + if ctx.Bool("remove") { + keyFiles = append(keyFiles[:exists], keyFiles[exists+1:]...) + } else { + if _, err := parseIdentityFile(file); err != nil { + return fmt.Errorf("could not add invalid identity file: %w", err) + } + keyFiles = append(keyFiles, file) + } + + cmd("git", "config", "--unset-all", "git-age.identity") + for _, keyFile := range keyFiles { + if _, err := cmd("git", "config", "--add", "git-age.identity", keyFile); err != nil { + return err + } + } + + return nil +} + +func actionListIdentities(ctx *cli.Context, files []string) error { + var sb strings.Builder + for _, file := range files { + _, err := parseIdentityFile(file) + valid := "✓" + if err != nil { + valid = "x" + } + sb.WriteString(fmt.Sprintf("%s %q\n", valid, file)) + } + fmt.Print(sb.String()) + return nil +} diff --git a/cmd/init.go b/cmd/init.go new file mode 100644 index 0000000..e450af1 --- /dev/null +++ b/cmd/init.go @@ -0,0 +1,91 @@ +package cmd + +import ( + "bytes" + "fmt" + "os" + "os/exec" + "path/filepath" + + "github.com/urfave/cli/v2" +) + +var Init = &cli.Command{ + Name: "init", + Aliases: []string{"i"}, + Description: "Initialize git-age", + Action: actionInit, +} + +func actionInit(ctx *cli.Context) error { + exe, err := os.Executable() + if err != nil { + return fmt.Errorf("could not get path to executable: %w", err) + } + var debugFlag string + if debug { + debugFlag = " -d" + } + if _, err := cmd("git", "config", "filter.git-age.required", "true"); err != nil { + return err + } + if _, err := cmd("git", "config", "filter.git-age.smudge", exe+debugFlag+" smudge -f %f"); err != nil { + return err + } + if _, err := cmd("git", "config", "filter.git-age.clean", exe+debugFlag+" clean -f %f"); err != nil { + return err + } + if _, err := cmd("git", "config", "diff.git-age.textconv", exe+debugFlag+" textconv"); err != nil { + return err + } + + cfg, err := LoadConfig() + if err != nil { + return err + } + dir, err := gitBaseDir() + if err != nil { + return err + } + + for file := range cfg { + apn := filepath.Join(dir, file) + args := []string{"smudge", "-f", file} + if debug { + args = append([]string{"-d"}, args...) + } + if err := func() error { + content, err := os.ReadFile(apn) + if err != nil { + return err + } + + var buf bytes.Buffer + cmd := exec.Command(exe, args...) + cmd.Stdin = bytes.NewReader(content) + cmd.Stdout = &buf + if debug { + cmd.Stderr = os.Stderr + } + if err := cmd.Run(); err != nil { + if debug { + fmt.Fprintf(os.Stderr, "could not smudge file: %v\n", err) + } + return nil + } + + fi, err := os.Create(apn) + if err != nil { + return err + } + defer fi.Close() + fi.Write(buf.Bytes()) + + return nil + }(); err != nil { + return err + } + } + + return nil +} diff --git a/cmd/smudge.go b/cmd/smudge.go new file mode 100644 index 0000000..38f2f5e --- /dev/null +++ b/cmd/smudge.go @@ -0,0 +1,63 @@ +package cmd + +import ( + "io" + "os" + "path/filepath" + + "filippo.io/age" + "github.com/urfave/cli/v2" + "lukechampine.com/blake3" +) + +var Smudge = &cli.Command{ + Name: "smudge", + Aliases: []string{"s"}, + Description: "Git smudge filter", + Hidden: true, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "file", + Usage: "File being worked on", + Aliases: []string{"f"}, + }, + }, + Action: actionSmudge, +} + +func actionSmudge(ctx *cli.Context) error { + identities, err := ageIdentities() + if err != nil { + return err + } + + dir, err := gitConfigDir(ctx.String("file")) + if err != nil { + return err + } + + hashFile, err := os.Create(filepath.Join(dir, "blake3")) + if err != nil { + return err + } + defer hashFile.Close() + ageFile, err := os.Create(filepath.Join(dir, "age")) + if err != nil { + return err + } + defer ageFile.Close() + hasher := blake3.New(64, nil) + defer hashFile.Write(hasher.Sum(nil)) + + ageTee := io.TeeReader(os.Stdin, ageFile) + decrypted, err := age.Decrypt(ageTee, identities...) + if err != nil { + return err + } + hashTee := io.TeeReader(decrypted, hasher) + if _, err := io.Copy(os.Stdout, hashTee); err != nil { + return err + } + + return nil +} diff --git a/cmd/textconv.go b/cmd/textconv.go new file mode 100644 index 0000000..d411776 --- /dev/null +++ b/cmd/textconv.go @@ -0,0 +1,56 @@ +package cmd + +import ( + "bytes" + "io" + "os" + + "filippo.io/age" + "github.com/urfave/cli/v2" +) + +var TextConv = &cli.Command{ + Name: "textconv", + Aliases: []string{"t"}, + Description: "Git textconv", + Hidden: true, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "file", + Usage: "File being worked on", + Aliases: []string{"f"}, + }, + }, + Action: actionTextConv, +} + +func actionTextConv(ctx *cli.Context) error { + identities, err := ageIdentities() + if err != nil { + return err + } + + fi, err := os.Open(ctx.Args().First()) + if err != nil { + return err + } + defer fi.Close() + contents, err := io.ReadAll(fi) + if err != nil { + return err + } + + r, err := age.Decrypt(bytes.NewReader(contents), identities...) + if err != nil { + // TODO debug print err + if _, cerr := io.Copy(os.Stdout, bytes.NewReader(contents)); cerr != nil { + return err + } + return nil + } + + if _, err := io.Copy(os.Stdout, r); err != nil { + return err + } + return nil +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..ee578d6 --- /dev/null +++ b/go.mod @@ -0,0 +1,20 @@ +module go.jolheiser.com/git-age + +go 1.20 + +require ( + filippo.io/age v1.1.1 + github.com/urfave/cli/v2 v2.25.7 + gopkg.in/yaml.v3 v3.0.1 + lukechampine.com/blake3 v1.2.1 +) + +require ( + filippo.io/edwards25519 v1.0.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/crypto v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..884b7c4 --- /dev/null +++ b/go.sum @@ -0,0 +1,25 @@ +filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= +filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= +github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= +golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= +lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= diff --git a/key.txt b/key.txt new file mode 100644 index 0000000..ad40b18 --- /dev/null +++ b/key.txt @@ -0,0 +1,3 @@ +# created: 2023-07-30T16:23:59-05:00 +# public key: age13nf8wry2lzyy0wtzq9qz0hkm2xumez074nuu0qwe8l0vsell2s2s6rgqch +AGE-SECRET-KEY-1PP648XJV8LEQHZSDGV4VUCYZH2TCZKA6XW9M55A58VQFEA4R9UXS7A9ZVQ diff --git a/main.go b/main.go new file mode 100644 index 0000000..adf0745 --- /dev/null +++ b/main.go @@ -0,0 +1,15 @@ +package main + +import ( + "fmt" + "os" + + "go.jolheiser.com/git-age/cmd" +) + +func main() { + app := cmd.New() + if err := app.Run(os.Args); err != nil { + fmt.Fprintln(os.Stderr, err) + } +} diff --git a/secrets/age.txt b/secrets/age.txt new file mode 100644 index 0000000..f618909 --- /dev/null +++ b/secrets/age.txt @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> X25519 Izm0YhE7eJGxrmegT4zajucxzYJMbX5i1mGs9M+/RHk +dT+lHOHMPLzln4z9OgMYCLMN6CytRnd6SEbbz1YXJgg +--- 0LP+90unjtDvXyoLjQO5Vbo8xcPVSRnEuvJ+/ECo8AA +L]=+uR1%DytSK@]}3Ԑ8 -T=™u \ No newline at end of file diff --git a/secrets/ssh.txt b/secrets/ssh.txt new file mode 100644 index 0000000..cc63857 --- /dev/null +++ b/secrets/ssh.txt @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 RBeVkQ jCnXNIzkMbJRe/W6TRGqi7kMHvn4Kci/Gn9BdlaJ9SQ +W+a1lKF+Ifgt33+eEwfTAX7GjD/UnXBjGR4UuTUepNE +--- dhbs5Q9kn2nhQjI9Xbqj2RNon4dBHImsPxNQxS95kN4 +$ݳ@ck<67_ώJkt .UtUx:797rp&Rd"d\ \ No newline at end of file diff --git a/ssh b/ssh new file mode 100644 index 0000000..d4b60ac --- /dev/null +++ b/ssh @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACCuqlZXsNoG/pW9X//fl4BzOKMvMEZWoRaZte1Jd5Z/SAAAAJB32JZHd9iW +RwAAAAtzc2gtZWQyNTUxOQAAACCuqlZXsNoG/pW9X//fl4BzOKMvMEZWoRaZte1Jd5Z/SA +AAAED9BSjG6Lc79j+TD4/X8nKnztxs4jwjfDrLBt0BjVvPFa6qVlew2gb+lb1f/9+XgHM4 +oy8wRlahFpm17Ul3ln9IAAAAB2dpdC1hZ2UBAgMEBQY= +-----END OPENSSH PRIVATE KEY----- diff --git a/ssh.pub b/ssh.pub new file mode 100644 index 0000000..6a3799b --- /dev/null +++ b/ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6qVlew2gb+lb1f/9+XgHM4oy8wRlahFpm17Ul3ln9I git-age