GDrive: Fix fieldNotWritable, Add SupportSharedDrive, Add service_account method #512

DoyunShin · 2022-10-25T11:32:06Z

No description provided.

&drive.File Size => fieldNotWritable error

SupportsAllDrives(true) => all action IncludeItemsFromAllDrives(true) => List

Done

server/storage/gdrive.go

Check localConfigPath == "" on NEWGDriveStorage()

This reverts commit cd9c56e.

DoyunShin · 2022-10-26T00:48:08Z

Didnt expected gDriveRootConfigFile requires localConfigPath on commit cd9c56e
reverted with 73ac766

aspacca · 2022-10-26T02:09:22Z

how do you select a shared drive as target?
currently we write the root of transfer.sh in the main folder, and save the id
https://github.com/dutchcoders/transfer.sh/blob/main/server/storage/gdrive.go#L87-L96

is giving the service account access to a specific shared folder that you end up using a folder? (total guess)

aspacca · 2022-10-26T02:04:03Z

server/storage/gdrive.go

-		return nil, err
+	var httpClient *http.Client
+
+	if strings.Contains(string(b), `"type": "service_account"`) {


let's have a separate cli param for service account file

param like --gdrive-type=service / oauth2?
or we can actually check in json.

Oauth2
{ "installed": { "client_id": "clientid", "project_id": "projectname", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "client_secret": "clientsecret" } }

Service Account
{ "type": "service_account", "project_id": "projectname", "private_key_id": "keyid", "private_key": "-----BEGIN PRIVATE KEY-----\nKEYSECRET\n-----END PRIVATE KEY-----\n", "client_email": "transfersh@projectname.iam.gserviceaccount.com", "client_id": "clientid", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/transfersh%40projectname.iam.gserviceaccount.com" }

param like --gdrive-type=service / oauth2?
or we can actually check in json.

param like gdrive-client-json-filepath: gdrive-service-account-json-filepath

only one of the two can be set

in the factory you can translate this to a single param with the path and a new param for the type (service account/oauth2): it is up to you

server/storage/gdrive.go

DoyunShin · 2022-10-26T02:34:09Z

is giving the service account access to a specific shared folder that you end up using a folder? (total guess)

Yep. By giving a permission to service account(name@projectname.iam.gserviceaccount.com), the service account can access to shared folder

how do you select a shared drive as target?

i think we can get folder id from basedir
(and if basedir is "root" then get root folder)

JWTConfigFromJson to getGDriveClientFromServiceAccount

DoyunShin · 2022-10-27T06:31:06Z

be00bb8
Changed to Using basedir as rootID.

if basedir == "root", then user's drive root folder is used to store files.

DoyunShin · 2022-10-27T06:41:04Z

#512 (comment)

About this,
#512 (comment)
This is the credentials of service account and oauth2.

There is no problem even if we receive the auth-type with cli or automatically identify it with credentials.json.
Which choice do we go?

Or, it seems that there will be no problem even if it is made to work both when auth-type is entered or not.

aspacca · 2022-10-28T09:39:31Z

server/storage/gdrive.go

-		return nil, err
+	var httpClient *http.Client
+
+	if strings.Contains(string(b), `"type": "service_account"`) {


param like --gdrive-type=service / oauth2?
or we can actually check in json.

param like gdrive-client-json-filepath: gdrive-service-account-json-filepath

only one of the two can be set

in the factory you can translate this to a single param with the path and a new param for the type (service account/oauth2): it is up to you

aspacca · 2022-10-28T09:43:02Z

server/storage/gdrive.go

-	err = ioutil.WriteFile(rootFileConfig, []byte(s.rootID), os.FileMode(0600))
-	if err != nil {
-		return err
+func (s *GDrive) checkRoot() error {


this is a breaking change.

basedir is the name of the folder to be created in the gdrive, rootID is the id of the folder once created and that we save. the two carry two different information.

if we replce rootID value with basedir value:

we don't create the folder

current installations have to change the value that they pass to basedir, to use instead rootID

I guess you meant this change to be the way to select a shared drive, is it?

Yep!

I changed basedir to insert folder id, to select rootID.

I cannot accept a breaking change, sorry
you have to find another way to provide the sharedfolder to use and the basedir as it was

server/storage/gdrive.go

DoyunShin · 2022-11-01T01:23:51Z

in the factory you can translate this to a single param with the path and a new param for the type (service account/oauth2): it is up to you

Added gdrive-auth-type
oauth2|service_account

aspacca · 2022-11-08T10:04:32Z

cmd/cmd.go

@@ -169,6 +169,12 @@ var globalFlags = []cli.Flag{
 		Value:  "",
 		EnvVar: "GDRIVE_CLIENT_JSON_FILEPATH",
 	},
+	cli.StringFlag{
+		Name:   "gdrive-auth-type",


this way you pass gdrive-client-json-filepath when it's a gdrive-service-account-filepath indeed

also it's a breaking change, I cannot accept it, sorry :(

you can add gdrive-service-account-filepath, check that only this or gdrive-client-json-filepath is set (and at least one of them), and set the authType value to pass to the factory: https://github.com/dutchcoders/transfer.sh/pull/512/files#diff-8e494a434a8037b6c0b888e25b2baae7618fe65e792d4a155dadd096e9350667R488

please, remember to change the name of the param in the factory to something generic, like gdriveCredentialsFilepath

aspacca

please. see my latest comments :)

DoyunShin added 5 commits October 25, 2022 20:21

GDrive: Support service_account

106609d

GDrive: *FIX* fieldNotWritable

9cd6e4f

&drive.File Size => fieldNotWritable error

GDrive: Support Shared drive

f4f04b9

SupportsAllDrives(true) => all action IncludeItemsFromAllDrives(true) => List

GDrive: jwt import

f318207

GDrive: credential type logging

2675350

Done

aspacca reviewed Oct 25, 2022

View reviewed changes

server/storage/gdrive.go Outdated Show resolved Hide resolved

GDrive: Check gdrive-local-config-path on Oauth2

cd9c56e

Check localConfigPath == "" on NEWGDriveStorage()

DoyunShin requested a review from aspacca October 26, 2022 00:45

Revert "GDrive: Check gdrive-local-config-path on Oauth2"

73ac766

This reverts commit cd9c56e.

aspacca reviewed Oct 26, 2022

View reviewed changes

DoyunShin added 7 commits October 26, 2022 13:03

Update getGDriveClientFromServiceAccount

fb87a5b

JWTConfigFromJson to getGDriveClientFromServiceAccount

GDrive: getGDriveClientFromToken

f096300

GDrive: SupportsAllDrives on download

71d8858

GDrive: authType on GDrive struct

f73922d

GDrive: JWT to google.JWTConfigFromJSON

f517bdc

GDrive: Token Redirecturl to urn:ietf:wg:oauth:2.0:oob

0327122

GDrive: basedir as rootID

be00bb8

DoyunShin requested a review from aspacca October 27, 2022 06:41

aspacca reviewed Oct 28, 2022

View reviewed changes

DoyunShin added 3 commits October 31, 2022 09:19

GDrive: Add gdrive-auth-type

91492e1

GDrive: service to service_account

478341c

GDrive: README.md

c96cf41

DoyunShin requested a review from aspacca November 3, 2022 12:05

aspacca reviewed Nov 8, 2022

View reviewed changes

aspacca requested changes Nov 8, 2022

View reviewed changes

aspacca mentioned this pull request Dec 1, 2022

Feature: support Google Shared Drives #390

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GDrive: Fix fieldNotWritable, Add SupportSharedDrive, Add service_account method #512

GDrive: Fix fieldNotWritable, Add SupportSharedDrive, Add service_account method #512

DoyunShin commented Oct 25, 2022

DoyunShin commented Oct 26, 2022 •

edited

aspacca commented Oct 26, 2022

aspacca Oct 26, 2022

DoyunShin Oct 26, 2022

DoyunShin Oct 26, 2022

aspacca Oct 28, 2022

DoyunShin commented Oct 26, 2022 •

edited

DoyunShin commented Oct 27, 2022

DoyunShin commented Oct 27, 2022

aspacca Oct 28, 2022

aspacca Oct 28, 2022

DoyunShin Oct 30, 2022

aspacca Nov 8, 2022

DoyunShin commented Nov 1, 2022

aspacca Nov 8, 2022

aspacca left a comment

GDrive: Fix fieldNotWritable, Add SupportSharedDrive, Add service_account method #512

Are you sure you want to change the base?

GDrive: Fix fieldNotWritable, Add SupportSharedDrive, Add service_account method #512

Conversation

DoyunShin commented Oct 25, 2022

DoyunShin commented Oct 26, 2022 • edited

aspacca commented Oct 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DoyunShin commented Oct 26, 2022 • edited

DoyunShin commented Oct 27, 2022

DoyunShin commented Oct 27, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DoyunShin commented Nov 1, 2022

Choose a reason for hiding this comment

aspacca left a comment

Choose a reason for hiding this comment

DoyunShin commented Oct 26, 2022 •

edited

DoyunShin commented Oct 26, 2022 •

edited