Skip to content

Commit b00b530

Browse files
sfc-gh-pfusramikg
sfc-gh-pfus
and
ramikg
authored
Remove executable bits in file open/creation
Co-authored-by: Rami <[email protected]>
1 parent 856123c commit b00b530

16 files changed

+39
-38
lines changed

‎azure_storage_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func (util *snowflakeAzureClient) uploadFile(
204204
})
205205
} else {
206206
var f *os.File
207-
f, err = os.OpenFile(dataFile, os.O_RDONLY, os.ModePerm)
207+
f, err = os.Open(dataFile)
208208
if err != nil {
209209
return err
210210
}
@@ -273,7 +273,7 @@ func (util *snowflakeAzureClient) nativeDownloadFile(
273273
if meta.mockAzureClient != nil {
274274
blobClient = meta.mockAzureClient
275275
}
276-
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, os.ModePerm)
276+
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, readWriteFileMode)
277277
if err != nil {
278278
return err
279279
}

‎doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ both an escape character and as a separator in path names.
889889
To send information from a stream (rather than a file) use code similar to the code below.
890890
(The ReplaceAll() function is needed on Windows to handle backslashes in the path to the file.)
891891
892-
fileStream, _ := os.OpenFile(fname, os.O_RDONLY, os.ModePerm)
892+
fileStream, _ := os.Open(fname)
893893
defer func() {
894894
if fileStream != nil {
895895
fileStream.Close()

‎encrypt_util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func encryptFile(
176176
if err != nil {
177177
return nil, "", err
178178
}
179-
infile, err := os.OpenFile(filename, os.O_CREATE|os.O_RDONLY, os.ModePerm)
179+
infile, err := os.OpenFile(filename, os.O_CREATE|os.O_RDONLY, readWriteFileMode)
180180
if err != nil {
181181
return nil, "", err
182182
}
@@ -232,7 +232,7 @@ func decryptFile(
232232
return "", err
233233
}
234234
defer tmpOutputFile.Close()
235-
infile, err := os.OpenFile(filename, os.O_RDONLY, os.ModePerm)
235+
infile, err := os.Open(filename)
236236
if err != nil {
237237
return "", err
238238
}

‎encrypt_util_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestEncryptDecryptFile(t *testing.T) {
3333
data := "test data"
3434
inputFile := "test_encrypt_decrypt_file"
3535

36-
fd, err := os.OpenFile(inputFile, os.O_CREATE|os.O_WRONLY, os.ModePerm)
36+
fd, err := os.Create(inputFile)
3737
if err != nil {
3838
t.Error(err)
3939
}
@@ -54,7 +54,7 @@ func TestEncryptDecryptFile(t *testing.T) {
5454
}
5555
defer os.Remove(decryptedFile)
5656

57-
fd, err = os.OpenFile(decryptedFile, os.O_RDONLY, os.ModePerm)
57+
fd, err = os.Open(decryptedFile)
5858
if err != nil {
5959
t.Error(err)
6060
}
@@ -144,7 +144,7 @@ func encryptDecryptFile(t *testing.T, encMat snowflakeFileEncryption, expected i
144144
defer os.Remove(decryptedFile)
145145

146146
cnt := 0
147-
fd, err := os.OpenFile(decryptedFile, os.O_RDONLY, os.ModePerm)
147+
fd, err := os.Open(decryptedFile)
148148
if err != nil {
149149
t.Error(err)
150150
}
@@ -168,7 +168,7 @@ func generateKLinesOfNByteRows(numLines int, numBytes int, tmpDir string) (strin
168168
}
169169
}
170170
fname := path.Join(tmpDir, "file"+strconv.FormatInt(int64(numLines*numBytes), 10))
171-
f, err := os.OpenFile(fname, os.O_CREATE|os.O_WRONLY, os.ModePerm)
171+
f, err := os.Create(fname)
172172
if err != nil {
173173
return "", err
174174
}
@@ -191,7 +191,7 @@ func generateKLinesOfNFiles(k int, n int, compress bool, tmpDir string) (string,
191191
}
192192
for i := 0; i < n; i++ {
193193
fname := path.Join(tmpDir, "file"+strconv.FormatInt(int64(i), 10))
194-
f, err := os.OpenFile(fname, os.O_CREATE|os.O_WRONLY, os.ModePerm)
194+
f, err := os.Create(fname)
195195
if err != nil {
196196
return "", err
197197
}
@@ -233,12 +233,12 @@ func generateKLinesOfNFiles(k int, n int, compress bool, tmpDir string) (string,
233233
io.ReadAll(gzipErr)
234234
gzipCmd.Wait()
235235
} else {
236-
fOut, err := os.OpenFile(fname+".gz", os.O_CREATE|os.O_WRONLY, os.ModePerm)
236+
fOut, err := os.Create(fname + ".gz")
237237
if err != nil {
238238
return "", err
239239
}
240240
w := gzip.NewWriter(fOut)
241-
fIn, err := os.OpenFile(fname, os.O_RDONLY, os.ModePerm)
241+
fIn, err := os.Open(fname)
242242
if err != nil {
243243
return "", err
244244
}

‎file_transfer_agent_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func TestUnitDownloadWithInvalidLocalPath(t *testing.T) {
6262
}
6363
defer os.RemoveAll(tmpDir)
6464
testData := filepath.Join(tmpDir, "data.txt")
65-
f, err := os.OpenFile(testData, os.O_CREATE|os.O_RDWR, os.ModePerm)
65+
f, err := os.Create(testData)
6666
if err != nil {
6767
t.Error(err)
6868
}

‎file_util.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ type snowflakeFileUtil struct {
1919
}
2020

2121
const (
22-
fileChunkSize = 16 * 4 * 1024
22+
fileChunkSize = 16 * 4 * 1024
23+
readWriteFileMode os.FileMode = 0666
2324
)
2425

2526
func (util *snowflakeFileUtil) compressFileWithGzipFromStream(srcStream **bytes.Buffer) (*bytes.Buffer, int, error) {
@@ -39,12 +40,12 @@ func (util *snowflakeFileUtil) compressFileWithGzip(fileName string, tmpDir stri
3940
basename := baseName(fileName)
4041
gzipFileName := filepath.Join(tmpDir, basename+"_c.gz")
4142

42-
fr, err := os.OpenFile(fileName, os.O_RDONLY, os.ModePerm)
43+
fr, err := os.Open(fileName)
4344
if err != nil {
4445
return "", -1, err
4546
}
4647
defer fr.Close()
47-
fw, err := os.OpenFile(gzipFileName, os.O_WRONLY|os.O_CREATE, os.ModePerm)
48+
fw, err := os.OpenFile(gzipFileName, os.O_WRONLY|os.O_CREATE, readWriteFileMode)
4849
if err != nil {
4950
return "", -1, err
5051
}

‎gcs_storage_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (util *snowflakeGcsClient) uploadFile(
196196
uploadSrc = meta.realSrcStream
197197
}
198198
} else {
199-
uploadSrc, err = os.OpenFile(dataFile, os.O_RDONLY, os.ModePerm)
199+
uploadSrc, err = os.Open(dataFile)
200200
if err != nil {
201201
return err
202202
}
@@ -314,7 +314,7 @@ func (util *snowflakeGcsClient) nativeDownloadFile(
314314
return meta.lastError
315315
}
316316

317-
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, os.ModePerm)
317+
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, readWriteFileMode)
318318
if err != nil {
319319
return err
320320
}

‎local_storage_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (util *localUtil) uploadOneFileWithRetry(meta *fileMetadata) error {
4747
return nil
4848
}
4949
}
50-
output, err := os.OpenFile(filepath.Join(user, meta.dstFileName), os.O_CREATE|os.O_WRONLY, os.ModePerm)
50+
output, err := os.OpenFile(filepath.Join(user, meta.dstFileName), os.O_CREATE|os.O_WRONLY, readWriteFileMode)
5151
if err != nil {
5252
return err
5353
}
@@ -100,7 +100,7 @@ func (util *localUtil) downloadOneFile(meta *fileMetadata) error {
100100
if err != nil {
101101
return err
102102
}
103-
if err = os.WriteFile(fullDstFileName, data, os.ModePerm); err != nil {
103+
if err = os.WriteFile(fullDstFileName, data, readWriteFileMode); err != nil {
104104
return err
105105
}
106106
fi, err := os.Stat(fullDstFileName)

‎local_storage_client_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestLocalUpload(t *testing.T) {
2525
gzw := gzip.NewWriter(&b)
2626
gzw.Write([]byte(originalContents))
2727
gzw.Close()
28-
if err := os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
28+
if err := os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
2929
t.Fatal("could not write to gzip file")
3030
}
3131
putDir, err := os.MkdirTemp("", "put")
@@ -73,7 +73,7 @@ func TestLocalUpload(t *testing.T) {
7373
if uploadMeta.resStatus != skipped {
7474
t.Fatal("overwrite is false. should have skipped")
7575
}
76-
fileStream, _ := os.OpenFile(fname, os.O_RDONLY, os.ModePerm)
76+
fileStream, _ := os.Open(fname)
7777
ctx := WithFileStream(context.Background(), fileStream)
7878
uploadMeta.srcStream = getFileStream(ctx)
7979

@@ -116,7 +116,7 @@ func TestDownloadLocalFile(t *testing.T) {
116116
gzw := gzip.NewWriter(&b)
117117
gzw.Write([]byte(originalContents))
118118
gzw.Close()
119-
if err := os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
119+
if err := os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
120120
t.Fatal("could not write to gzip file")
121121
}
122122
putDir, err := os.MkdirTemp("", "put")

‎ocsp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ func initOCSPCache() {
723723
ocspResponseCacheLock = &sync.RWMutex{}
724724

725725
logger.Infof("reading OCSP Response cache file. %v\n", cacheFileName)
726-
f, err := os.OpenFile(cacheFileName, os.O_CREATE|os.O_RDONLY, os.ModePerm)
726+
f, err := os.OpenFile(cacheFileName, os.O_CREATE|os.O_RDONLY, readWriteFileMode)
727727
if err != nil {
728728
logger.Debugf("failed to open. Ignored. %v\n", err)
729729
return

‎ocsp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ func TestInitOCSPCacheFileCreation(t *testing.T) {
515515
defer func() {
516516
src, _ = os.Open(tmpFileName)
517517
defer src.Close()
518-
dst, _ = os.OpenFile(srcFileName, os.O_WRONLY, os.ModePerm)
518+
dst, _ = os.OpenFile(srcFileName, os.O_WRONLY, readWriteFileMode)
519519
defer dst.Close()
520520
// copy temporary file contents back to original file
521521
if _, err = io.Copy(dst, src); err != nil {

‎put_get_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestPutError(t *testing.T) {
4141
defer os.RemoveAll(tmpDir)
4242
file1 := filepath.Join(tmpDir, "file1")
4343
remoteLocation := filepath.Join(tmpDir, "remote_loc")
44-
f, err := os.OpenFile(file1, os.O_CREATE|os.O_WRONLY, os.ModePerm)
44+
f, err := os.Create(file1)
4545
if err != nil {
4646
t.Error(err)
4747
}
@@ -250,7 +250,7 @@ func TestPutWithAutoCompressFalse(t *testing.T) {
250250
}
251251
defer os.RemoveAll(tmpDir)
252252
testData := filepath.Join(tmpDir, "data.txt")
253-
f, err := os.OpenFile(testData, os.O_CREATE|os.O_WRONLY, os.ModePerm)
253+
f, err := os.Create(testData)
254254
if err != nil {
255255
t.Error(err)
256256
}
@@ -291,7 +291,7 @@ func TestPutOverwrite(t *testing.T) {
291291
}
292292
defer os.RemoveAll(tmpDir)
293293
testData := filepath.Join(tmpDir, "data.txt")
294-
f, err := os.OpenFile(testData, os.O_CREATE|os.O_RDWR, os.ModePerm)
294+
f, err := os.Create(testData)
295295
if err != nil {
296296
t.Error(err)
297297
}
@@ -392,14 +392,14 @@ func testPutGet(t *testing.T, isStream bool) {
392392
gzw := gzip.NewWriter(&b)
393393
gzw.Write([]byte(originalContents))
394394
gzw.Close()
395-
if err = os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
395+
if err = os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
396396
t.Fatal("could not write to gzip file")
397397
}
398398

399399
runTests(t, dsn, func(dbt *DBTest) {
400400
dbt.mustExec("create or replace table " + tableName +
401401
" (a int, b string)")
402-
fileStream, err := os.OpenFile(fname, os.O_RDONLY, os.ModePerm)
402+
fileStream, err := os.Open(fname)
403403
if err != nil {
404404
t.Error(err)
405405
}
@@ -517,15 +517,15 @@ func TestPutGetGcsDownscopedCredential(t *testing.T) {
517517
gzw := gzip.NewWriter(&b)
518518
gzw.Write([]byte(originalContents))
519519
gzw.Close()
520-
if err = os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
520+
if err = os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
521521
t.Fatal("could not write to gzip file")
522522
}
523523

524524
dsn = dsn + "&GCS_USE_DOWNSCOPED_CREDENTIAL=true"
525525
runTests(t, dsn, func(dbt *DBTest) {
526526
dbt.mustExec("create or replace table " + tableName +
527527
" (a int, b string)")
528-
fileStream, err := os.OpenFile(fname, os.O_RDONLY, os.ModePerm)
528+
fileStream, err := os.Open(fname)
529529
if err != nil {
530530
t.Error(err)
531531
}

‎put_get_user_stage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func putGetUserStage(t *testing.T, tmpDir string, numberOfFiles int, numberOfLin
6969
dbt.mustExec("rm @" + stageName)
7070
var fs *os.File
7171
if isStream {
72-
fs, _ = os.OpenFile(files, os.O_RDONLY, os.ModePerm)
72+
fs, _ = os.Open(files)
7373
dbt.mustExecContext(WithFileStream(context.Background(), fs),
7474
fmt.Sprintf("put 'file://%v' @%v", strings.ReplaceAll(
7575
files, "\\", "\\\\"), stageName))

‎put_get_with_aws_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func TestPutWithInvalidToken(t *testing.T) {
102102
gzw := gzip.NewWriter(&b)
103103
gzw.Write([]byte(originalContents))
104104
gzw.Close()
105-
if err := os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
105+
if err := os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
106106
t.Fatal("could not write to gzip file")
107107
}
108108

@@ -214,7 +214,7 @@ func TestPretendToPutButList(t *testing.T) {
214214
gzw := gzip.NewWriter(&b)
215215
gzw.Write([]byte(originalContents))
216216
gzw.Close()
217-
if err := os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
217+
if err := os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
218218
t.Fatal("could not write to gzip file")
219219
}
220220

@@ -283,7 +283,7 @@ func TestPutGetAWSStage(t *testing.T) {
283283
gzw := gzip.NewWriter(&b)
284284
gzw.Write([]byte(originalContents))
285285
gzw.Close()
286-
if err = os.WriteFile(fname, b.Bytes(), os.ModePerm); err != nil {
286+
if err = os.WriteFile(fname, b.Bytes(), readWriteFileMode); err != nil {
287287
t.Fatal("could not write to gzip file")
288288
}
289289

‎s3_storage_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func (util *snowflakeS3Client) nativeDownloadFile(
217217
}
218218
}
219219

220-
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, os.ModePerm)
220+
f, err := os.OpenFile(fullDstFileName, os.O_CREATE|os.O_WRONLY, readWriteFileMode)
221221
if err != nil {
222222
return err
223223
}

‎secure_storage_manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func TestCreateCredentialCache(t *testing.T) {
122122
// cleanup
123123
src, _ = os.Open(tmpFileName)
124124
defer src.Close()
125-
dst, _ = os.OpenFile(srcFileName, os.O_WRONLY, os.ModePerm)
125+
dst, _ = os.OpenFile(srcFileName, os.O_WRONLY, readWriteFileMode)
126126
defer dst.Close()
127127
// copy temporary file contents back to original file
128128
if _, err = io.Copy(dst, src); err != nil {

0 commit comments

Comments
 (0)