-
Notifications
You must be signed in to change notification settings - Fork 4
Expand file tree
/
Copy pathtest_gitprivacy.py
More file actions
1322 lines (1243 loc) · 56.3 KB
/
Copy pathtest_gitprivacy.py
File metadata and controls
1322 lines (1243 loc) · 56.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
import copy
import git # type: ignore
import locale
import os
import pathlib
import time
import unittest
from click.testing import CliRunner
from datetime import datetime, timedelta, timezone
from typing import Dict, Optional
from gitprivacy.gitprivacy import cli, GitPrivacyConfig
import gitprivacy.utils as utils
# make sure no non-local configs are used
HOME = ".home"
NO_GLOBAL_CONF_ENV = dict(
HOME=HOME, # ignore global config
XDG_CONFIG_HOME="",
GIT_CONFIG_NOSYSTEM="yes", # ignore system config
)
class TestGitPrivacy(unittest.TestCase):
def setUp(self) -> None:
os.environ.update(NO_GLOBAL_CONF_ENV)
self.home = HOME # only used for templates
self.runner = CliRunner()
# Prevent gitpython from forcing locales to ascii
os.environ.update(self.getLang())
@staticmethod
def getLang() -> Dict:
lc, code = locale.getlocale()
if lc and code:
lc_str = f"{lc}.{code}"
else:
lc_str = "C.UTF-8"
return dict(LANG=lc_str, LC_ALL=lc_str)
def setUpRepo(self) -> None:
self.repo = git.Repo.init()
self.git = self.repo.git
self.configGit(self.git)
@staticmethod
def configGit(gitwrap: git.Git) -> None:
# set user info
gitwrap.config(["user.name", "John Doe"])
gitwrap.config(["user.email", "jdoe@example.com"])
# Prevent locale issue when git-privacy is called from hooks
gitwrap.update_environment(**TestGitPrivacy.getLang())
def setUpRemote(self, name="origin") -> git.Remote:
r = git.Repo.init(f"remote_{name}", mkdir=True, bare=True)
return self.repo.create_remote(name, r.working_dir)
def setConfig(self) -> None:
self.git.config(["privacy.pattern", "m,s"])
def addCommit(self, filename: str, repo: Optional[git.Repo] = None) -> git.Commit:
if not repo:
repo = self.repo
oldcwd = os.getcwd()
os.chdir(repo.working_dir)
with open(filename, "w") as f:
f.write(filename)
repo.git.add(filename)
res, _stdout, stderr = repo.git.commit(
f"-m {filename}",
with_extended_output=True,
)
if res != 0:
raise RuntimeError("Commit failed %s" % stderr)
os.chdir(oldcwd)
# make sure there are no rewrites logged during normal commits
self.assertNotIn("redate-rewrites", stderr)
# return a copy to avoid errors caused by the fazy loading of the
# Commit object which in combination with git-filter-repo's eager
# pruning results in failed lookups of no longer existing hashes
return copy.copy(self.repo.head.commit)
def invoke(self, args):
return self.runner.invoke(cli, args=args)
def test_nogit(self):
with self.runner.isolated_filesystem():
result = self.invoke('log')
self.assertEqual(result.exit_code, 2)
def test_logwithemptygit(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
result = self.invoke('log')
self.assertEqual(result.exit_code, 128)
def test_log(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.addCommit("a")
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertTrue(result.output.startswith("commit"))
self.assertEqual(result.output.count("commit"), 1)
self.addCommit("b")
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output.count("commit"), 2)
result = self.invoke('log a')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output.count("commit"), 1)
result = self.invoke('log -r HEAD~1..HEAD')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output.count("commit"), 1)
result = self.invoke('log -r HEAD~1..HEAD -- a')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output.count("commit"), 0)
result = self.invoke('log x')
self.assertEqual(result.exit_code, 2)
def test_redateempty(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
result = self.invoke('redate')
self.assertEqual(result.exit_code, 128)
def test_redatenoconfig(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.addCommit("a")
result = self.invoke('redate')
self.assertIn("Error: Missing pattern configuration.", result.output)
self.assertEqual(result.exit_code, 1)
def test_redate(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
result = self.invoke('redate')
self.assertEqual(result.exit_code, 0)
ar = self.repo.head.commit
self.assertNotEqual(a, ar)
self.assertNotEqual(a.authored_date, ar.authored_date)
self.assertEqual(ar.authored_datetime,
a.authored_datetime.replace(minute=0, second=0))
def test_redatemultiple(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
b = self.addCommit("b")
result = self.invoke('redate')
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD^")
br = self.repo.commit("HEAD")
self.assertNotEqual(a, ar)
self.assertNotEqual(b, br)
self.assertNotEqual(a.authored_date, ar.authored_date)
self.assertNotEqual(b.authored_date, br.authored_date)
def test_redatehead(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
b = self.addCommit("b")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD^")
br = self.repo.commit("HEAD")
self.assertEqual(a, ar)
self.assertNotEqual(b, br)
self.assertEqual(a.authored_date, ar.authored_date)
self.assertNotEqual(b.authored_date, br.authored_date)
def test_redateheadsinglecommit(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD")
self.assertNotEqual(a, ar)
self.assertNotEqual(a.authored_date, ar.authored_date)
def test_redateheadwithunstagedchanges(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
with open("a", "w") as f:
f.write("unstagedchange")
# redate should fail on dirty WD
result = self.invoke('redate')
self.assertEqual(result.exit_code, 1)
# head-only redating should work
result = self.invoke('redate --only-head')
self.assertEqual(result.exception, None)
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD")
self.assertNotEqual(a, ar)
self.assertNotEqual(a.authored_date, ar.authored_date)
def test_redateheadempty(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.commit(["--allow-empty", "-m foo"])
a = self.repo.head.commit
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD")
self.assertNotEqual(a, ar)
self.assertNotEqual(a.authored_date, ar.authored_date)
def test_redatefromstartpoint(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
a = self.addCommit("a")
self.git.checkout(["-b", "abranch"])
b = self.addCommit("b")
c = self.addCommit("c")
result = self.invoke('redate master')
self.assertEqual(result.exit_code, 0)
ar = self.repo.commit("HEAD~2")
br = self.repo.commit("HEAD~1")
cr = self.repo.commit("HEAD")
self.assertEqual(a, ar)
self.assertNotEqual(b, br)
self.assertNotEqual(c, cr)
def test_redatewrongstartpoint(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.addCommit("a")
result = self.invoke('redate abc')
self.assertEqual(result.exit_code, 128)
def test_redatestartpointhead(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.addCommit("a")
self.addCommit("b")
result = self.invoke('redate HEAD')
self.assertEqual(result.exit_code, 128)
def test_redatewithremote(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
remote = self.setUpRemote()
self.setConfig()
self.addCommit("a")
remote.push(self.repo.active_branch, set_upstream=True)
result = self.invoke('redate')
self.assertEqual(result.exit_code, 3)
result = self.invoke('redate -f')
self.assertEqual(result.exit_code, 0)
remote.push(force=True)
self.addCommit("b")
self.addCommit("c")
result = self.invoke('redate')
self.assertEqual(result.exit_code, 3)
result = self.invoke('redate HEAD~2')
self.assertEqual(result.exit_code, 0)
def test_init(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('init')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output, os.linesep.join(
f"Installed {hook} hook"
for hook in ["post-commit", "pre-commit", "post-rewrite",
"pre-push"]
) + os.linesep)
self.assertTrue(os.access(os.path.join(".git", "hooks", "post-commit"),
os.R_OK | os.X_OK))
self.assertTrue(os.access(os.path.join(".git", "hooks", "pre-commit"),
os.F_OK))
a = self.addCommit("a") # gitpython already returns the rewritten commit
self.assertEqual(a.authored_datetime,
a.authored_datetime.replace(minute=0, second=0))
def test_initwithcheck(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('init --timezone-change=abort')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output, os.linesep.join(
f"Installed {hook} hook"
for hook in ["post-commit", "pre-commit", "post-rewrite",
"pre-push"]
) + os.linesep)
self.assertTrue(os.access(os.path.join(".git", "hooks", "post-commit"),
os.R_OK | os.X_OK))
self.assertTrue(os.access(os.path.join(".git", "hooks", "pre-commit"),
os.R_OK | os.X_OK))
def test_checkempty(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('check')
self.assertEqual(result.exit_code, 0)
def test_checkone(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.addCommit("a")
result = self.invoke('check')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output, "")
def test_checkchange(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.ignoreTimezone", "false"]) # default is ignore
os.environ['TZ'] = 'Europe/London'
time.tzset()
self.addCommit("a")
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
result = self.invoke('check')
self.assertTrue(result.output.startswith(
"Warning: Your timezone has changed"))
self.assertEqual(result.exit_code, 2)
def test_checkchange_quotedmail(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
email = "johndoe@example.com"
email_quoted = f'"{email}"'
with self.repo.config_writer() as config:
config.set_value("user", "email", email_quoted)
self.git.config(["privacy.ignoreTimezone", "false"]) # default is ignore
os.environ['TZ'] = 'Europe/London'
time.tzset()
a = self.addCommit("a")
self.assertEqual(a.author.email, email)
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
result = self.invoke('check')
self.assertTrue(result.output.startswith(
"Warning: Your timezone has changed"))
self.assertEqual(result.exit_code, 2)
def test_checkchangeignore(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.ignoreTimezone", "true"])
os.environ['TZ'] = 'Europe/London'
time.tzset()
self.addCommit("a")
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
result = self.invoke('check')
self.assertEqual(result.exit_code, 0)
self.assertTrue(result.output.startswith(
"Warning: Your timezone has changed"))
def test_checkwithhook(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('init')
self.assertEqual(result.exit_code, 0)
os.environ['TZ'] = 'Europe/London'
time.tzset()
self.addCommit("a")
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
self.addCommit("b") # should not fail
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('init --timezone-change=abort')
self.assertEqual(result.exit_code, 0)
os.environ['TZ'] = 'Europe/London'
time.tzset()
self.addCommit("a")
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
with self.assertRaises(git.GitCommandError):
self.addCommit("b")
def test_checkdifferentusers(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.ignoreTimezone", "false"]) # default is ignore
os.environ['TZ'] = 'Europe/London'
time.tzset()
self.git.config(["user.email", "doe@example.com"])
self.addCommit("a")
os.environ['TZ'] = 'Europe/Berlin'
time.tzset()
result = self.invoke('check')
self.assertEqual(result.exit_code, 2)
self.git.config(["user.email", "johndoe@example.com"])
result = self.invoke('check')
self.assertEqual(result.exit_code, 0)
self.assertIn(
"info: Skipping tzcheck - no previous commits with this email",
result.output,
)
def get_real_dates(self, commit):
import gitprivacy.encoder.msgembed as msgenc
conf = GitPrivacyConfig(".")
crypto = conf.get_crypto()
self.assertNotEqual(crypto, None)
decoder = msgenc.MessageEmbeddingDecoder(crypto)
return decoder.decode(commit)
def test_encryptdates(self):
from gitprivacy import utils
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
a = self.addCommit("a")
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertFalse("RealDate" in result.output)
result = self.invoke('redate')
self.assertEqual(result.exit_code, 0)
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertTrue("RealDate" in result.output)
# check decrypted date correctness
somedt = datetime(2020, 1, 1, 6, 0, tzinfo=timezone(timedelta(0, 1800)))
self.assertEqual(utils.dt2gitdate(somedt), '1577856600 +0030')
self.assertEqual(utils.gitdate2dt('1577856600 +0030'), somedt)
self.assertEqual(
a.authored_datetime,
utils.gitdate2dt(utils.dt2gitdate(a.authored_datetime)),
)
ar = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(ar)
self.assertEqual(real_ad, a.authored_datetime)
self.assertEqual(real_cd, a.authored_datetime)
def test_msgembedciphercompatability(self):
import gitprivacy.encoder.msgembed as msgenc
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.password", "foobar"])
self.git.config(["privacy.salt", "U16/n+bWLbp/MJ9DEo+Th+bbpJjYMZ7yQSUwJmk0QWQ="])
conf = GitPrivacyConfig(".")
crypto = conf.get_crypto()
# old combined cipher mode
ad, cd = msgenc._decrypt_from_msg(
crypto,
"a\n\nGitPrivacy: Tsfmwy/PQxvg5YkXT90G/7FmCYTzf1ionUnLAqCj08HMG6SAzTQSxLfoF/7OYMzHFXh6apb8OcqcIQY2fGnajGcrXauoQCMZYA==\n"
)
self.assertNotEqual(ad, None)
self.assertNotEqual(cd, None)
# separate cipher mode
ad, cd = msgenc._decrypt_from_msg(
crypto,
"b\n\nGitPrivacy: 5+cmNIqj6DgRj2e00gHvTI+Llok5eOI6+o59IlGaize/SDHkKrLssqdXd8qzE7sbN6s6l+gen8E= NlfePlKFKT3L/Twi/9BcF/1pJYz0xoedTs7veoeAA9zpzMPOjg9vxMle3oYoPEFbrGb9pOgHqcU=\n"
)
self.assertNotEqual(ad, None)
self.assertNotEqual(cd, None)
def test_msgembedciphercompatability_keyfile(self):
import gitprivacy.crypto as gpcrypto
import gitprivacy.encoder.msgembed as msgenc
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.password", "foobar"])
self.git.config(["privacy.salt", "U16/n+bWLbp/MJ9DEo+Th+bbpJjYMZ7yQSUwJmk0QWQ="])
# migrate to keyfile
result = self.invoke('keys --migrate-pwd')
self.assertEqual(result.exit_code, 0)
conf = GitPrivacyConfig(".")
self.assertEqual(conf.password, "")
self.assertEqual(conf.salt, "")
crypto = conf.get_crypto()
self.assertIsInstance(crypto, gpcrypto.MultiSecretBox)
# old combined cipher mode
ad, cd = msgenc._decrypt_from_msg(
crypto,
"a\n\nGitPrivacy: Tsfmwy/PQxvg5YkXT90G/7FmCYTzf1ionUnLAqCj08HMG6SAzTQSxLfoF/7OYMzHFXh6apb8OcqcIQY2fGnajGcrXauoQCMZYA==\n"
)
self.assertNotEqual(ad, None)
self.assertNotEqual(cd, None)
# separate cipher mode
ad, cd = msgenc._decrypt_from_msg(
crypto,
"b\n\nGitPrivacy: 5+cmNIqj6DgRj2e00gHvTI+Llok5eOI6+o59IlGaize/SDHkKrLssqdXd8qzE7sbN6s6l+gen8E= NlfePlKFKT3L/Twi/9BcF/1pJYz0xoedTs7veoeAA9zpzMPOjg9vxMle3oYoPEFbrGb9pOgHqcU=\n"
)
self.assertNotEqual(ad, None)
self.assertNotEqual(cd, None)
def test_pwdmismatch(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.password", "passw0ord"])
result = self.invoke('init')
self.assertEqual(result.exit_code, 0)
self.addCommit("a")
self.git.config(["privacy.password", "geheim"])
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertFalse("RealDate" in result.output)
def test_redatestability(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
a = self.addCommit("a")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar = self.repo.head.commit
self.assertNotEqual(a.hexsha, ar.hexsha)
# do nothing to the repo
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar2 = self.repo.head.commit
# redate should not have altered anything
self.assertEqual(ar.message, ar2.message)
self.assertEqual(ar.hexsha, ar2.hexsha)
def test_commitdateupdate(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
a = self.addCommit("a")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
ar = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(ar)
self.assertEqual(real_ad, a.authored_datetime)
self.assertEqual(real_cd, a.committed_datetime)
time.sleep(1) # make sure update commit date is different
res, _, _ = self.git.commit([
"-m", ar.message,
"--amend",
], with_extended_output=True)
self.assertEqual(res, 0)
au = copy.copy(self.repo.head.commit)
# amend updated only commit date
self.assertEqual(au.authored_datetime, ar.authored_datetime)
self.assertNotEqual(au.committed_datetime, ar.committed_datetime)
self.assertEqual(ar.message, au.message)
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
aur = copy.copy(self.repo.head.commit)
self.assertNotEqual(au.message, aur.message)
u_real_ad, u_real_cd = self.get_real_dates(aur)
self.assertEqual(au.authored_datetime, aur.authored_datetime)
self.assertNotEqual(au.committed_datetime, aur.committed_datetime)
self.assertEqual(u_real_ad, a.authored_datetime)
self.assertEqual(u_real_cd, au.committed_datetime)
self.assertEqual(real_ad, u_real_ad)
self.assertNotEqual(real_cd, u_real_cd)
def load_exported_commit(self, path):
from importlib.resources import files
resource_path = files('tests') / path
with resource_path.open('rb') as input_fd:
res, stdout, stderr = self.git.fast_import(
"--force", # discard existing commits
istream=input_fd,
with_extended_output=True,
)
self.assertEqual(res, 0)
def test_cipherregression(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.password", "foobar"])
self.git.config(["privacy.salt", "U16/n+bWLbp/MJ9DEo+Th+bbpJjYMZ7yQSUwJmk0QWQ="])
# combined cipher format
self.load_exported_commit('data/commit_cipher_combined')
c = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(c)
tzinfo = timezone(timedelta(0, 7200))
self.assertEqual(real_ad, datetime(2020, 6, 29, 10, 6, 1, tzinfo=tzinfo))
self.assertEqual(real_cd, datetime(2020, 6, 29, 10, 6, 1, tzinfo=tzinfo))
# mixed cipher format
self.load_exported_commit('data/commit_cipher_mixed')
c = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(c)
tzinfo = timezone(timedelta(0, 7200))
self.assertEqual(real_ad, datetime(2020, 6, 29, 10, 6, 1, tzinfo=tzinfo))
self.assertEqual(real_cd, datetime(2020, 6, 29, 11, 0, 24, tzinfo=tzinfo))
# dedicated cipher format
self.load_exported_commit('data/commit_cipher_dedicated')
c = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(c)
tzinfo = timezone(timedelta(0, 7200))
self.assertEqual(real_ad, datetime(2020, 6, 29, 11, 3, 23, tzinfo=tzinfo))
self.assertEqual(real_cd, datetime(2020, 6, 29, 11, 23, 41, tzinfo=tzinfo))
# dedicated cipher format with different passwords
self.load_exported_commit('data/commit_cipher_diffpwds')
c = self.repo.head.commit
real_ad, real_cd = self.get_real_dates(c)
tzinfo = timezone(timedelta(0, 7200))
self.assertEqual(real_ad, datetime(2020, 6, 29, 17, 22, 1, tzinfo=tzinfo))
self.assertEqual(real_cd, None) # diff password – not decryptable
self.git.config(["privacy.password", "foobaz"])
real_ad, real_cd = self.get_real_dates(c)
self.assertEqual(real_ad, None) # diff password – not decryptable
self.assertEqual(real_cd, datetime(2020, 6, 29, 17, 23, 25, tzinfo=tzinfo))
self.git.config(["privacy.password", "foobauz"])
real_ad, real_cd = self.get_real_dates(c)
self.assertEqual(real_ad, None) # diff password – not decryptable
self.assertEqual(real_cd, None) # diff password – not decryptable
def test_redactemail(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
email = "privat@example.com"
self.git.config(["user.email", email])
a = self.addCommit("a")
self.assertEqual(a.author.email, email)
result = self.invoke('redact-email')
self.assertEqual(result.exit_code, 0)
result = self.invoke(f'redact-email {email}')
self.assertEqual(result.exit_code, 0)
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertFalse(email in result.output)
commit = self.repo.head.commit
self.assertNotEqual(commit.author.email, email)
self.assertNotEqual(commit.committer.email, email)
def test_redactemailcustomreplacement(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
name = "John Doe"
email = "privat@example.com"
repl = "public@example.com"
self.git.config(["user.name", name])
self.git.config(["user.email", email])
a = self.addCommit("a")
self.assertEqual(a.author.name, name)
self.assertEqual(a.author.email, email)
result = self.invoke(f'redact-email {email}:{repl}:too:many')
self.assertEqual(result.exit_code, 2)
result = self.invoke(f'redact-email {email}:{repl}')
self.assertEqual(result.exit_code, 0)
result = self.invoke('log')
self.assertEqual(result.exit_code, 0)
self.assertFalse(email in result.output)
self.assertTrue(repl in result.output)
commit = self.repo.head.commit
self.assertEqual(commit.author.name, name)
self.assertEqual(commit.author.email, repl)
self.assertEqual(commit.committer.email, repl)
# replace back and change name
new_name = "Doe, John"
result = self.invoke(f'redact-email {repl}:{email}:"{new_name}"')
self.assertEqual(result.exit_code, 0)
commit = self.repo.head.commit
self.assertEqual(commit.author.name, new_name)
self.assertEqual(commit.author.email, email)
self.assertEqual(commit.committer.name, new_name)
self.assertEqual(commit.committer.email, email)
def test_globaltemplate(self):
templdir = os.path.join(self.home, ".git_template")
with self.runner.isolated_filesystem():
os.mkdir(self.home)
self.setUpRepo()
self.setConfig()
result = self.invoke('init -g')
self.assertEqual(result.exception, None)
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output, os.linesep.join(
f"Installed {hook} hook"
for hook in ["post-commit", "pre-commit", "post-rewrite",
"pre-push"]
) + os.linesep)
# local Git repo initialised BEFORE global template was set up
# hence the hooks are not present and active locally yet
self.assertFalse(os.access(os.path.join(".git", "hooks", "post-commit"),
os.R_OK | os.X_OK)) # not installed locally
self.assertFalse(os.access(os.path.join(".git", "hooks", "pre-commit"),
os.F_OK))
self.assertTrue(os.access(os.path.join(templdir, "hooks", "post-commit"),
os.R_OK | os.X_OK))
self.assertTrue(os.access(os.path.join(templdir, "hooks", "pre-commit"),
os.F_OK))
a = self.addCommit("a") # gitpython already returns the rewritten commit
self.assertNotEqual(a.authored_datetime,
a.authored_datetime.replace(minute=0, second=0))
# Now reinit local repo to fetch template hooks
self.setUpRepo()
self.assertTrue(os.access(os.path.join(".git", "hooks", "post-commit"),
os.R_OK | os.X_OK)) # now installed locally too
self.assertTrue(os.access(os.path.join(".git", "hooks", "pre-commit"),
os.F_OK))
b = self.addCommit("b") # gitpython already returns the rewritten commit
self.assertEqual(b.authored_datetime,
b.authored_datetime.replace(minute=0, second=0))
def test_globaltemplate_init_outside_repo(self):
home = ".home"
os.path.join(home, ".git_template")
with self.runner.isolated_filesystem(), \
self.runner.isolation(env=dict(HOME=home)):
os.mkdir(home)
result = self.invoke('init -g')
self.assertEqual(result.exit_code, 2)
# installing a global hooks outside of a local repo is currently
# not possible, as repo checks are run before any command
def does_cherrypick_run_postcommit(self) -> bool:
with self.runner.isolated_filesystem():
self.setUpRepo()
hookdir = os.path.join(".git", "hooks")
hookpath = os.path.join(hookdir, "post-commit")
if not os.path.exists(hookdir):
os.mkdir(hookdir)
with open(hookpath, "w") as f:
f.write("/bin/sh\n\necho DEADBEEF")
os.chmod(hookpath, 0o755)
self.addCommit("a")
res, stdout, stderr = self.git.execute(
["git", "cherry-pick", "--keep-redundant-commits", "HEAD"],
with_extended_output=True,
)
self.git = None
self.repo = None
return "DEADBEEF" in stderr
def test_rebase(self):
cherryhook_active = self.does_cherrypick_run_postcommit()
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.addCommit("a")
c = self.addCommit("c")
b = self.addCommit("b")
def _log():
return [c.message.strip() for c in self.repo.iter_commits()]
self.assertEqual(_log(), ["b", "c", "a"])
# swap last two commits
def _rebase_cmds():
return (
f"p {self.repo.commit('HEAD')}"
"\n"
f"p {self.repo.commit('HEAD^')}"
)
res, stdout, stderr = self.git.rebase(
["-q", "-i", "HEAD~2"],
env=dict(GIT_SEQUENCE_EDITOR=f"echo '{_rebase_cmds()}' >"),
with_extended_output=True,
)
self.assertEqual(res, 0)
self.assertEqual(_log(), ["c", "b", "a"])
self.assertEqual(stdout, "")
self.assertNotIn("git.exc.GitCommandError", stderr)
self.assertNotIn("cherry-pick in progress", stderr)
# init git-privacy and try once more
result = self.invoke('init')
self.assertEqual(result.exit_code, 0)
# swap last two commits back
res, stdout, stderr = self.git.rebase(
["-q", "-i", "HEAD~2"],
env=dict(GIT_SEQUENCE_EDITOR=f"echo '{_rebase_cmds()}' >"),
with_extended_output=True,
)
self.assertEqual(res, 0)
self.assertEqual(_log(), ["b", "c", "a"])
self.assertEqual(stdout, "")
self.assertNotIn("git.exc.GitCommandError", stderr)
self.assertIn("redate-rewrites", stderr) # logged redates
# check result of redating during rebase
# depending on external factors a cherry-pick might not have
# concluded. Distinguish both cases.
br = self.repo.head.commit
cr = self.repo.commit("HEAD^")
if not cherryhook_active or "cherry-pick in progress" in stderr:
# no redate
self.assertEqual(b.authored_date, br.authored_date)
self.assertEqual(c.authored_date, cr.authored_date)
else:
# redated
self.assertNotEqual(b.authored_date, br.authored_date)
self.assertNotEqual(c.authored_date, cr.authored_date)
def test_rewritelog(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
result = self.invoke('init')
self.assertEqual(result.exit_code, 0)
# check redate empty repo
result = self.invoke('redate-rewrites')
self.assertEqual(result.exit_code, 128)
# check redate without pending rewrites
self.addCommit("a")
result = self.invoke('redate-rewrites')
self.assertEqual(result.exit_code, 0)
self.assertEqual(result.output, "No pending rewrites to redact\n")
# make sure an amend does not log a rewrite
# because the post-commit hook already took care
res, _, stderr = self.git.commit([
"--no-edit",
"--amend",
], with_extended_output=True)
self.assertEqual(res, 0)
self.assertNotIn("redate-rewrites", stderr)
# add two more commits and do some rebasing
self.addCommit("b")
self.addCommit("c")
# swap last two commits
def _rebase_cmds():
return (
f"p {self.repo.commit('HEAD')}"
"\n"
f"p {self.repo.commit('HEAD^')}"
)
res, stdout, stderr = self.git.rebase(
["-q", "-i", "HEAD~2"],
env=dict(GIT_SEQUENCE_EDITOR=f"echo '{_rebase_cmds()}' >"),
with_extended_output=True,
)
self.assertEqual(res, 0)
self.assertEqual(stdout, "")
self.assertIn("redate-rewrites", stderr) # logged redates
br = self.repo.head.commit
cr = self.repo.commit("HEAD^")
rwpath = os.path.join(self.repo.git_dir, "privacy", "rewrites")
with open(rwpath) as f:
rewrites = f.read()
self.assertEqual(len(rewrites.splitlines()), 2)
self.assertIn(br.hexsha, rewrites)
self.assertIn(cr.hexsha, rewrites)
self.assertFalse(self._is_loose(br))
self.assertFalse(self._is_loose(cr))
# redate rewrites
result = self.invoke('redate-rewrites')
self.assertEqual(result.exit_code, 0)
# check result of redating
self.assertTrue(self._is_loose(br))
self.assertTrue(self._is_loose(cr))
# rw log should be deleted after redating
self.assertFalse(os.path.exists(rwpath))
def _is_loose(self, commit) -> bool:
try:
return self.git.branch("--contains", commit.hexsha) == ""
except git.GitCommandError:
return True # cannot even find commit anymore
def test_replace(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.replacements", "true"])
# test replacement set by FilterRepoRewriter
a = self.addCommit("a")
result = self.invoke('redate')
self.assertEqual(result.exit_code, 0)
ar = self.repo.head.commit
self.assertNotEqual(a, ar)
rpls = self.git.replace("-l", "--format=medium").splitlines()
self.assertEqual(len(rpls), 1)
self.assertIn(f"{a.hexsha} -> {ar.hexsha}", rpls)
# test replacement set by AmendRewriter
b = self.addCommit("b")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
br = self.repo.head.commit
self.assertNotEqual(b, br)
rpls = self.git.replace("-l", "--format=medium").splitlines()
self.assertEqual(len(rpls), 2)
self.assertIn(f"{b.hexsha} -> {br.hexsha}", rpls)
# test without replacements
self.git.config(["--unset", "privacy.replacements"])
self.addCommit("c")
result = self.invoke('redate')
self.assertEqual(result.exit_code, 0)
self.addCommit("d")
result = self.invoke('redate --only-head')
self.assertEqual(result.exit_code, 0)
self.assertEqual(len(rpls), 2) # no further replacements
def test_pwdmigration(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
self.git.config(["privacy.password", "foobar"])
self.git.config(["privacy.salt", "U16/n+bWLbp/MJ9DEo+Th+bbpJjYMZ7yQSUwJmk0QWQ="])
# any non-migrate command should fail – since there is still a
# password set in the config
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 1)
self.assertFalse(os.path.isfile(".git/privacy/keys/current"))
# ... then migrate
result = self.invoke('keys --migrate-pwd')
self.assertEqual(result.exit_code, 0)
self.assertTrue(os.path.isfile(".git/privacy/keys/current"))
# password and salt config settings are gone (commented out)
with self.repo.config_reader() as config:
self.assertFalse(config.has_option("privacy", "password"))
self.assertFalse(config.has_option("privacy", "salt"))
# now migrate should fail – since there is no password anymore
result = self.invoke('keys --migrate-pwd')
self.assertEqual(result.exit_code, 1)
def test_pwdmigration_with_previous_key(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
# generate key
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
# set password
self.git.config(["privacy.password", "foobar"])
self.git.config(["privacy.salt", "U16/n+bWLbp/MJ9DEo+Th+bbpJjYMZ7yQSUwJmk0QWQ="])
# ... then migrate
result = self.invoke('keys --migrate-pwd')
self.assertEqual(result.exit_code, 1) # fails because no confirmation
# password and salt config settings are still there
with self.repo.config_reader() as config:
self.assertTrue(config.has_option("privacy", "password"))
self.assertTrue(config.has_option("privacy", "salt"))
def test_key_activation_deactivation(self):
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
# try disable key without any key present
result = self.invoke('keys --disable')
self.assertEqual(result.exit_code, 1)
# init
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
self.assertTrue(os.path.isfile(".git/privacy/keys/current"))
self.assertFalse(os.path.isfile(".git/privacy/keys/archive/1"))
# disable key
result = self.invoke('keys --disable')
self.assertEqual(result.exit_code, 0)
self.assertFalse(os.path.isfile(".git/privacy/keys/current"))
self.assertTrue(os.path.isfile(".git/privacy/keys/archive/1"))
def test_key_renewal(self):
current_p = pathlib.Path(".git/privacy/keys/current")
archive1_p = pathlib.Path(".git/privacy/keys/archive/1")
archive2_p = pathlib.Path(".git/privacy/keys/archive/2")
with self.runner.isolated_filesystem():
self.setUpRepo()
self.setConfig()
# check renewal without previous key
result = self.invoke('keys --new')
self.assertEqual(result.exit_code, 1)
# generate init key
result = self.invoke('keys --init')
self.assertEqual(result.exit_code, 0)
self.assertTrue(current_p.is_file())
self.assertFalse(archive1_p.is_file())
old_key = current_p.read_text()
# renew key
result = self.invoke('keys --new')
self.assertEqual(result.exit_code, 0)
self.assertTrue(current_p.is_file())
self.assertTrue(archive1_p.is_file())
a1_key = archive1_p.read_text()
self.assertEqual(old_key, a1_key)
# test --no-archive