Merge pull request #355 from intelzhongjie/master

nkubala · web-flow · commit 15751cb2d437 · 2021-04-20T09:34:04.000-07:00
Resolve symlink issue.
diff --git a/pkg/util/fs_utils.go b/pkg/util/fs_utils.go
@@ -39,7 +39,7 @@ type DirectoryEntry struct {
 }
 
 func GetSize(path string) int64 {
-	stat, err := os.Stat(path)
+	stat, err := os.Lstat(path)
 	if err != nil {
 		logrus.Errorf("Could not obtain size for %s: %s", path, err)
 		return -1
@@ -56,7 +56,7 @@ func GetSize(path string) int64 {
 
 //GetFileContents returns the contents of a file at the specified path
 func GetFileContents(path string) (*string, error) {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
+	if _, err := os.Lstat(path); os.IsNotExist(err) {
 		return nil, err
 	}
 
@@ -145,11 +145,11 @@ func CheckSameSymlink(f1name, f2name string) (bool, error) {
 
 func CheckSameFile(f1name, f2name string) (bool, error) {
 	// Check first if files differ in size and immediately return
-	f1stat, err := os.Stat(f1name)
+	f1stat, err := os.Lstat(f1name)
 	if err != nil {
 		return false, err
 	}
-	f2stat, err := os.Stat(f2name)
+	f2stat, err := os.Lstat(f2name)
 	if err != nil {
 		return false, err
 	}
diff --git a/tests/file_diff_expected.json b/tests/file_diff_expected.json
@@ -23,7 +23,7 @@
         },
         {
           "Name": "/usr/bin/cc",
-          "Size": 768648
+          "Size": 3
         },
         {
           "Name": "/usr/bin/cpp",
@@ -5043,7 +5043,7 @@
         },
         {
           "Name": "/usr/lib/cpp",
-          "Size": 772720
+          "Size": 10
         },
         {
           "Name": "/usr/lib/gcc",
@@ -5099,7 +5099,7 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libasan.a",
-          "Size": -1
+          "Size": 42
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libasan.so",
@@ -5111,7 +5111,7 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libatomic.a",
-          "Size": -1
+          "Size": 44
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libatomic.so",
@@ -5127,7 +5127,7 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgcc_s.so",
-          "Size": -1
+          "Size": 18
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgcov.a",
@@ -5139,35 +5139,35 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgomp.so",
-          "Size": -1
+          "Size": 28
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libitm.a",
-          "Size": -1
+          "Size": 41
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libitm.so",
           "Size": 35
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflap.a",
-          "Size": -1
+          "Size": 45
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflap.so",
           "Size": 39
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflapth.a",
-          "Size": -1
+          "Size": 47
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflapth.so",
           "Size": 41
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libquadmath.a",
-          "Size": -1
+          "Size": 46
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libquadmath.so",
@@ -5451,7 +5451,7 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcc_s.so",
-          "Size": -1
+          "Size": 20
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcov.a",
@@ -5463,7 +5463,7 @@
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgomp.so",
-          "Size": 154880
+          "Size": 34
         },
         {
           "Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgomp.spec",
@@ -5511,19 +5511,19 @@
         },
         {
           "Name": "/usr/lib64/libBrokenLocale.so",
-          "Size": 8480
+          "Size": 32
         },
         {
           "Name": "/usr/lib64/libanl.so",
-          "Size": 19840
+          "Size": 23
         },
         {
           "Name": "/usr/lib64/libbsd-compat.a",
           "Size": 1330
         },
         {
           "Name": "/usr/lib64/libbsd.a",
-          "Size": 1330
+          "Size": 15
         },
         {
           "Name": "/usr/lib64/libc.so",
@@ -5535,23 +5535,23 @@
         },
         {
           "Name": "/usr/lib64/libcidn.so",
-          "Size": 201064
+          "Size": 24
         },
         {
           "Name": "/usr/lib64/libcrypt.so",
-          "Size": 40664
+          "Size": 25
         },
         {
           "Name": "/usr/lib64/libdl.so",
-          "Size": 19288
+          "Size": 22
         },
         {
           "Name": "/usr/lib64/libg.a",
           "Size": 1330
         },
         {
           "Name": "/usr/lib64/libgomp.so.1",
-          "Size": 154880
+          "Size": 16
         },
         {
           "Name": "/usr/lib64/libgomp.so.1.0.0",
@@ -5563,59 +5563,59 @@
         },
         {
           "Name": "/usr/lib64/libm.so",
-          "Size": 1137024
+          "Size": 21
         },
         {
           "Name": "/usr/lib64/libmcheck.a",
           "Size": 11440
         },
         {
           "Name": "/usr/lib64/libmpc.so.3",
-          "Size": 99664
+          "Size": 15
         },
         {
           "Name": "/usr/lib64/libmpc.so.3.0.0",
           "Size": 99664
         },
         {
           "Name": "/usr/lib64/libmpfr.so.4",
-          "Size": 377424
+          "Size": 16
         },
         {
           "Name": "/usr/lib64/libmpfr.so.4.1.1",
           "Size": 377424
         },
         {
           "Name": "/usr/lib64/libnsl.so",
-          "Size": 115848
+          "Size": 23
         },
         {
           "Name": "/usr/lib64/libnss_compat.so",
-          "Size": 46432
+          "Size": 30
         },
         {
           "Name": "/usr/lib64/libnss_db.so",
-          "Size": 38088
+          "Size": 26
         },
         {
           "Name": "/usr/lib64/libnss_dns.so",
-          "Size": 31408
+          "Size": 27
         },
         {
           "Name": "/usr/lib64/libnss_files.so",
-          "Size": 61624
+          "Size": 29
         },
         {
           "Name": "/usr/lib64/libnss_hesiod.so",
-          "Size": 23680
+          "Size": 30
         },
         {
           "Name": "/usr/lib64/libnss_nis.so",
-          "Size": 56656
+          "Size": 27
         },
         {
           "Name": "/usr/lib64/libnss_nisplus.so",
-          "Size": 69680
+          "Size": 31
         },
         {
           "Name": "/usr/lib64/libpthread.so",
@@ -5627,23 +5627,23 @@
         },
         {
           "Name": "/usr/lib64/libresolv.so",
-          "Size": 105824
+          "Size": 26
         },
         {
           "Name": "/usr/lib64/librpcsvc.a",
           "Size": 54398
         },
         {
           "Name": "/usr/lib64/librt.so",
-          "Size": 43776
+          "Size": 22
         },
         {
           "Name": "/usr/lib64/libthread_db.so",
-          "Size": 38232
+          "Size": 29
         },
         {
           "Name": "/usr/lib64/libutil.so",
-          "Size": 14496
+          "Size": 24
         },
         {
           "Name": "/usr/libexec/gcc",
@@ -5667,11 +5667,11 @@
         },
         {
           "Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so",
-          "Size": 76584
+          "Size": 22
         },
         {
           "Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so.0",
-          "Size": 76584
+          "Size": 22
         },
         {
           "Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so.0.0.0",
@@ -5691,7 +5691,7 @@
         },
         {
           "Name": "/usr/libexec/getconf/default",
-          "Size": 26544
+          "Size": 19
         },
         {
           "Name": "/usr/share/doc/gcc-4.8.5",
@@ -6803,4 +6803,4 @@
       ]
     }
   }
-]
+]

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"Name": "/usr/bin/cc",`
`26`		`- "Size": 768648`
	`26`	`+ "Size": 3`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"Name": "/usr/bin/cpp",`
`@@ -5043,7 +5043,7 @@`
`5043`	`5043`	`},`
`5044`	`5044`	`{`
`5045`	`5045`	`"Name": "/usr/lib/cpp",`
`5046`		`- "Size": 772720`
	`5046`	`+ "Size": 10`
`5047`	`5047`	`},`
`5048`	`5048`	`{`
`5049`	`5049`	`"Name": "/usr/lib/gcc",`
`@@ -5099,7 +5099,7 @@`
`5099`	`5099`	`},`
`5100`	`5100`	`{`
`5101`	`5101`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libasan.a",`
`5102`		`- "Size": -1`
	`5102`	`+ "Size": 42`
`5103`	`5103`	`},`
`5104`	`5104`	`{`
`5105`	`5105`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libasan.so",`
`@@ -5111,7 +5111,7 @@`
`5111`	`5111`	`},`
`5112`	`5112`	`{`
`5113`	`5113`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libatomic.a",`
`5114`		`- "Size": -1`
	`5114`	`+ "Size": 44`
`5115`	`5115`	`},`
`5116`	`5116`	`{`
`5117`	`5117`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libatomic.so",`
`@@ -5127,7 +5127,7 @@`
`5127`	`5127`	`},`
`5128`	`5128`	`{`
`5129`	`5129`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgcc_s.so",`
`5130`		`- "Size": -1`
	`5130`	`+ "Size": 18`
`5131`	`5131`	`},`
`5132`	`5132`	`{`
`5133`	`5133`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgcov.a",`
`@@ -5139,35 +5139,35 @@`
`5139`	`5139`	`},`
`5140`	`5140`	`{`
`5141`	`5141`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgomp.so",`
`5142`		`- "Size": -1`
	`5142`	`+ "Size": 28`
`5143`	`5143`	`},`
`5144`	`5144`	`{`
`5145`	`5145`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libitm.a",`
`5146`		`- "Size": -1`
	`5146`	`+ "Size": 41`
`5147`	`5147`	`},`
`5148`	`5148`	`{`
`5149`	`5149`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libitm.so",`
`5150`	`5150`	`"Size": 35`
`5151`	`5151`	`},`
`5152`	`5152`	`{`
`5153`	`5153`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflap.a",`
`5154`		`- "Size": -1`
	`5154`	`+ "Size": 45`
`5155`	`5155`	`},`
`5156`	`5156`	`{`
`5157`	`5157`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflap.so",`
`5158`	`5158`	`"Size": 39`
`5159`	`5159`	`},`
`5160`	`5160`	`{`
`5161`	`5161`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflapth.a",`
`5162`		`- "Size": -1`
	`5162`	`+ "Size": 47`
`5163`	`5163`	`},`
`5164`	`5164`	`{`
`5165`	`5165`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libmudflapth.so",`
`5166`	`5166`	`"Size": 41`
`5167`	`5167`	`},`
`5168`	`5168`	`{`
`5169`	`5169`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libquadmath.a",`
`5170`		`- "Size": -1`
	`5170`	`+ "Size": 46`
`5171`	`5171`	`},`
`5172`	`5172`	`{`
`5173`	`5173`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libquadmath.so",`
`@@ -5451,7 +5451,7 @@`
`5451`	`5451`	`},`
`5452`	`5452`	`{`
`5453`	`5453`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcc_s.so",`
`5454`		`- "Size": -1`
	`5454`	`+ "Size": 20`
`5455`	`5455`	`},`
`5456`	`5456`	`{`
`5457`	`5457`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcov.a",`
`@@ -5463,7 +5463,7 @@`
`5463`	`5463`	`},`
`5464`	`5464`	`{`
`5465`	`5465`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgomp.so",`
`5466`		`- "Size": 154880`
	`5466`	`+ "Size": 34`
`5467`	`5467`	`},`
`5468`	`5468`	`{`
`5469`	`5469`	`"Name": "/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgomp.spec",`
`@@ -5511,19 +5511,19 @@`
`5511`	`5511`	`},`
`5512`	`5512`	`{`
`5513`	`5513`	`"Name": "/usr/lib64/libBrokenLocale.so",`
`5514`		`- "Size": 8480`
	`5514`	`+ "Size": 32`
`5515`	`5515`	`},`
`5516`	`5516`	`{`
`5517`	`5517`	`"Name": "/usr/lib64/libanl.so",`
`5518`		`- "Size": 19840`
	`5518`	`+ "Size": 23`
`5519`	`5519`	`},`
`5520`	`5520`	`{`
`5521`	`5521`	`"Name": "/usr/lib64/libbsd-compat.a",`
`5522`	`5522`	`"Size": 1330`
`5523`	`5523`	`},`
`5524`	`5524`	`{`
`5525`	`5525`	`"Name": "/usr/lib64/libbsd.a",`
`5526`		`- "Size": 1330`
	`5526`	`+ "Size": 15`
`5527`	`5527`	`},`
`5528`	`5528`	`{`
`5529`	`5529`	`"Name": "/usr/lib64/libc.so",`
`@@ -5535,23 +5535,23 @@`
`5535`	`5535`	`},`
`5536`	`5536`	`{`
`5537`	`5537`	`"Name": "/usr/lib64/libcidn.so",`
`5538`		`- "Size": 201064`
	`5538`	`+ "Size": 24`
`5539`	`5539`	`},`
`5540`	`5540`	`{`
`5541`	`5541`	`"Name": "/usr/lib64/libcrypt.so",`
`5542`		`- "Size": 40664`
	`5542`	`+ "Size": 25`
`5543`	`5543`	`},`
`5544`	`5544`	`{`
`5545`	`5545`	`"Name": "/usr/lib64/libdl.so",`
`5546`		`- "Size": 19288`
	`5546`	`+ "Size": 22`
`5547`	`5547`	`},`
`5548`	`5548`	`{`
`5549`	`5549`	`"Name": "/usr/lib64/libg.a",`
`5550`	`5550`	`"Size": 1330`
`5551`	`5551`	`},`
`5552`	`5552`	`{`
`5553`	`5553`	`"Name": "/usr/lib64/libgomp.so.1",`
`5554`		`- "Size": 154880`
	`5554`	`+ "Size": 16`
`5555`	`5555`	`},`
`5556`	`5556`	`{`
`5557`	`5557`	`"Name": "/usr/lib64/libgomp.so.1.0.0",`
`@@ -5563,59 +5563,59 @@`
`5563`	`5563`	`},`
`5564`	`5564`	`{`
`5565`	`5565`	`"Name": "/usr/lib64/libm.so",`
`5566`		`- "Size": 1137024`
	`5566`	`+ "Size": 21`
`5567`	`5567`	`},`
`5568`	`5568`	`{`
`5569`	`5569`	`"Name": "/usr/lib64/libmcheck.a",`
`5570`	`5570`	`"Size": 11440`
`5571`	`5571`	`},`
`5572`	`5572`	`{`
`5573`	`5573`	`"Name": "/usr/lib64/libmpc.so.3",`
`5574`		`- "Size": 99664`
	`5574`	`+ "Size": 15`
`5575`	`5575`	`},`
`5576`	`5576`	`{`
`5577`	`5577`	`"Name": "/usr/lib64/libmpc.so.3.0.0",`
`5578`	`5578`	`"Size": 99664`
`5579`	`5579`	`},`
`5580`	`5580`	`{`
`5581`	`5581`	`"Name": "/usr/lib64/libmpfr.so.4",`
`5582`		`- "Size": 377424`
	`5582`	`+ "Size": 16`
`5583`	`5583`	`},`
`5584`	`5584`	`{`
`5585`	`5585`	`"Name": "/usr/lib64/libmpfr.so.4.1.1",`
`5586`	`5586`	`"Size": 377424`
`5587`	`5587`	`},`
`5588`	`5588`	`{`
`5589`	`5589`	`"Name": "/usr/lib64/libnsl.so",`
`5590`		`- "Size": 115848`
	`5590`	`+ "Size": 23`
`5591`	`5591`	`},`
`5592`	`5592`	`{`
`5593`	`5593`	`"Name": "/usr/lib64/libnss_compat.so",`
`5594`		`- "Size": 46432`
	`5594`	`+ "Size": 30`
`5595`	`5595`	`},`
`5596`	`5596`	`{`
`5597`	`5597`	`"Name": "/usr/lib64/libnss_db.so",`
`5598`		`- "Size": 38088`
	`5598`	`+ "Size": 26`
`5599`	`5599`	`},`
`5600`	`5600`	`{`
`5601`	`5601`	`"Name": "/usr/lib64/libnss_dns.so",`
`5602`		`- "Size": 31408`
	`5602`	`+ "Size": 27`
`5603`	`5603`	`},`
`5604`	`5604`	`{`
`5605`	`5605`	`"Name": "/usr/lib64/libnss_files.so",`
`5606`		`- "Size": 61624`
	`5606`	`+ "Size": 29`
`5607`	`5607`	`},`
`5608`	`5608`	`{`
`5609`	`5609`	`"Name": "/usr/lib64/libnss_hesiod.so",`
`5610`		`- "Size": 23680`
	`5610`	`+ "Size": 30`
`5611`	`5611`	`},`
`5612`	`5612`	`{`
`5613`	`5613`	`"Name": "/usr/lib64/libnss_nis.so",`
`5614`		`- "Size": 56656`
	`5614`	`+ "Size": 27`
`5615`	`5615`	`},`
`5616`	`5616`	`{`
`5617`	`5617`	`"Name": "/usr/lib64/libnss_nisplus.so",`
`5618`		`- "Size": 69680`
	`5618`	`+ "Size": 31`
`5619`	`5619`	`},`
`5620`	`5620`	`{`
`5621`	`5621`	`"Name": "/usr/lib64/libpthread.so",`
`@@ -5627,23 +5627,23 @@`
`5627`	`5627`	`},`
`5628`	`5628`	`{`
`5629`	`5629`	`"Name": "/usr/lib64/libresolv.so",`
`5630`		`- "Size": 105824`
	`5630`	`+ "Size": 26`
`5631`	`5631`	`},`
`5632`	`5632`	`{`
`5633`	`5633`	`"Name": "/usr/lib64/librpcsvc.a",`
`5634`	`5634`	`"Size": 54398`
`5635`	`5635`	`},`
`5636`	`5636`	`{`
`5637`	`5637`	`"Name": "/usr/lib64/librt.so",`
`5638`		`- "Size": 43776`
	`5638`	`+ "Size": 22`
`5639`	`5639`	`},`
`5640`	`5640`	`{`
`5641`	`5641`	`"Name": "/usr/lib64/libthread_db.so",`
`5642`		`- "Size": 38232`
	`5642`	`+ "Size": 29`
`5643`	`5643`	`},`
`5644`	`5644`	`{`
`5645`	`5645`	`"Name": "/usr/lib64/libutil.so",`
`5646`		`- "Size": 14496`
	`5646`	`+ "Size": 24`
`5647`	`5647`	`},`
`5648`	`5648`	`{`
`5649`	`5649`	`"Name": "/usr/libexec/gcc",`
`@@ -5667,11 +5667,11 @@`
`5667`	`5667`	`},`
`5668`	`5668`	`{`
`5669`	`5669`	`"Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so",`
`5670`		`- "Size": 76584`
	`5670`	`+ "Size": 22`
`5671`	`5671`	`},`
`5672`	`5672`	`{`
`5673`	`5673`	`"Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so.0",`
`5674`		`- "Size": 76584`
	`5674`	`+ "Size": 22`
`5675`	`5675`	`},`
`5676`	`5676`	`{`
`5677`	`5677`	`"Name": "/usr/libexec/gcc/x86_64-redhat-linux/4.8.2/liblto_plugin.so.0.0.0",`
`@@ -5691,7 +5691,7 @@`
`5691`	`5691`	`},`
`5692`	`5692`	`{`
`5693`	`5693`	`"Name": "/usr/libexec/getconf/default",`
`5694`		`- "Size": 26544`
	`5694`	`+ "Size": 19`
`5695`	`5695`	`},`
`5696`	`5696`	`{`
`5697`	`5697`	`"Name": "/usr/share/doc/gcc-4.8.5",`
`@@ -6803,4 +6803,4 @@`
`6803`	`6803`	`]`
`6804`	`6804`	`}`
`6805`	`6805`	`}`
`6806`		`-]`
	`6806`	`+]`