Skip to content

Fix race conditions in OneDrive driver reference support by adding mutex protection #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jerrita merged 4 commits into from
Oct 7, 2025
Merged

Fix race conditions in OneDrive driver reference support by adding mutex protection #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d4e55a
Initial plan
Copilot Oct 7, 2025
b7d9a93
Add mutex protection for d.ref field accesses to fix race conditions
Copilot Oct 7, 2025
ab6c3c9
Add OpenList binary to .gitignore
Copilot Oct 7, 2025
d151bce
Revert .gitignore changes as requested
Copilot Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion drivers/onedrive/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,33 @@ func (d *Onedrive) Init(ctx context.Context) error {
if d.ChunkSize < 1 {
d.ChunkSize = 5
}
if d.ref != nil {
d.mutex.Lock()
hasRef := d.ref != nil
if hasRef {
d.AccessToken = d.ref.AccessToken
d.RefreshToken = d.ref.RefreshToken
}
d.mutex.Unlock()
if hasRef {
return nil
}
return d.refreshToken()
}

func (d *Onedrive) InitReference(refStorage driver.Driver) error {
if ref, ok := refStorage.(*Onedrive); ok {
d.mutex.Lock()
d.ref = ref
d.mutex.Unlock()
return nil
}
return errs.NotSupport
}

func (d *Onedrive) Drop(ctx context.Context) error {
d.mutex.Lock()
d.ref = nil
d.mutex.Unlock()
return nil
}

Expand Down
16 changes: 12 additions & 4 deletions drivers/onedrive/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,19 @@ func (d *Onedrive) refreshToken() error {
}

func (d *Onedrive) _refreshToken() error {
if d.ref != nil {
err := d.ref._refreshToken()
d.mutex.Lock()
ref := d.ref
d.mutex.Unlock()

if ref != nil {
err := ref._refreshToken()
if err != nil {
return err
}
d.AccessToken = d.ref.AccessToken
d.RefreshToken = d.ref.RefreshToken
d.mutex.Lock()
d.AccessToken = ref.AccessToken
d.RefreshToken = ref.RefreshToken
d.mutex.Unlock()
return nil
}

Expand Down Expand Up @@ -146,10 +152,12 @@ func (d *Onedrive) _refreshToken() error {
func (d *Onedrive) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
req := base.RestyClient.R()

d.mutex.Lock()
token := d.AccessToken
if d.ref != nil {
token = d.ref.AccessToken
}
d.mutex.Unlock()

req.SetHeader("Authorization", "Bearer "+token)
if callback != nil {
Expand Down