Skip to content

chore: display warnings on app share failure #9783

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
merged 6 commits into from
Sep 19, 2023
Merged

chore: display warnings on app share failure #9783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b3dd7c
chore: add warnings to app share failure
Emyrk Sep 19, 2023
0863a60
add owner role check
Emyrk Sep 19, 2023
7175e9a
Add comment
Emyrk Sep 19, 2023
c7f178e
Cleanup
Emyrk Sep 19, 2023
5987265
Change to unordered list
Emyrk Sep 19, 2023
700484d
Formatting
Emyrk Sep 19, 2023
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
Prev Previous commit
Next Next commit
Cleanup
  • Loading branch information
@Emyrk
Emyrk committed Sep 19, 2023
commit c7f178e8a951992edf23b0bd66fece9b2e9676e6
8 changes: 4 additions & 4 deletions coderd/workspaceapps/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (p *DBTokenProvider) authorizeRequest(ctx context.Context, roles *httpmw.Au
// should be shared, but we are disabling it from a deployment wide
// flag. So the template should be fixed to set the sharing level to
// "owner" instead and this will not appear.
warnings = append(warnings, fmt.Sprintf("path-based app sharing is disabled (see --dangerous-allow-path-app-sharing), forcing sharing level to \"owner\", was %q", sharingLevel))
warnings = append(warnings, fmt.Sprintf("unable to use configured sharing level %q because path-based app sharing is disabled (see --dangerous-allow-path-app-sharing), using sharing level \"owner\" instead", sharingLevel))
}
sharingLevel = database.AppSharingLevelOwner
}
Expand Down Expand Up @@ -300,7 +300,7 @@ func (p *DBTokenProvider) authorizeRequest(ctx context.Context, roles *httpmw.Au
// scope allows it).
err := p.Authorizer.Authorize(ctx, roles.Actor, rbacAction, rbacResource)
if err == nil {
return true, warnings, nil
return true, []string{}, nil
}

switch sharingLevel {
Expand All @@ -313,13 +313,13 @@ func (p *DBTokenProvider) authorizeRequest(ctx context.Context, roles *httpmw.Au
// to connect to the actor's own workspace. This enforces scopes.
err := p.Authorizer.Authorize(ctx, roles.Actor, rbacAction, rbacResourceOwned)
if err == nil {
return true, warnings, nil
return true, []string{}, nil
}
case database.AppSharingLevelPublic:
// We don't really care about scopes and stuff if it's public anyways.
// Someone with a restricted-scope API key could just not submit the API
// key cookie in the request and access the page.
return true, warnings, nil
return true, []string{}, nil
}

// No checks were successful.
Expand Down
5 changes: 0 additions & 5 deletions site/static/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@
padding-left: 10px;
}

/*.svg-icon.svg-baseline svg {*/
/* top: .125em;*/
/* position: relative;*/
/*}*/

</style>
</head>
<body>
Expand Down