Skip to content

Commit

Permalink
refactor authentication. Detect garbage token or token with not suffi…
Browse files Browse the repository at this point in the history 
…cient scopes
  • Loading branch information
Matthias Cram committed Aug 2, 2022
1 parent 26b0438 commit 07f17df
Show file tree
Hide file tree
Showing 66 changed files with 251 additions and 44 deletions.
0 ...-Core.package/SPBUserAuth.class/README.md → ...age/SPBAuthenticationForm.class/README.md
View file
File renamed without changes.
0 ...e.package/SPBUserAuth.class/class/open.st → ...SPBAuthenticationForm.class/class/open.st
View file
File renamed without changes.
0 ...PBUserAuth.class/instance/actionCancel.st → ...cationForm.class/instance/actionCancel.st
View file
File renamed without changes.
0 ...Auth.class/instance/actionSaveAndClose.st → ...Form.class/instance/actionSaveAndClose.st
View file
File renamed without changes.
0 ...PBUserAuth.class/instance/actionToken..st → ...cationForm.class/instance/actionToken..st
View file
File renamed without changes.
0 ...SPBUserAuth.class/instance/actionToken.st → ...icationForm.class/instance/actionToken.st
View file
File renamed without changes.
0 ...serAuth.class/instance/actionUsername..st → ...ionForm.class/instance/actionUsername..st
View file
File renamed without changes.
0 ...UserAuth.class/instance/actionUsername.st → ...tionForm.class/instance/actionUsername.st
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...BUserAuth.class/instance/buildButtons..st → ...ationForm.class/instance/buildButtons..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildButtons: builder

^ {builder pluggableButtonSpec new
model: self;
label: 'Change';
label: 'Submit';
action: #actionSaveAndClose;
yourself.
builder pluggableButtonSpec new
Expand Down
0 ...rAuth.class/instance/buildInputFields..st → ...nForm.class/instance/buildInputFields..st
View file
File renamed without changes.
0 ...erAuth.class/instance/buildInputPanel..st → ...onForm.class/instance/buildInputPanel..st
View file
File renamed without changes.
0 .../SPBUserAuth.class/instance/buildWith..st → ...ticationForm.class/instance/buildWith..st
View file
File renamed without changes.
0 ...UserAuth.class/instance/checkUserValid.st → ...tionForm.class/instance/checkUserValid.st
View file
File renamed without changes.
0 ...ckage/SPBUserAuth.class/instance/close.st → ...uthenticationForm.class/instance/close.st
View file
File renamed without changes.
0 ...SPBUserAuth.class/instance/labelString.st → ...icationForm.class/instance/labelString.st
View file
File renamed without changes.
0 ...kage/SPBUserAuth.class/instance/token..st → ...thenticationForm.class/instance/token..st
View file
File renamed without changes.
0 ...ckage/SPBUserAuth.class/instance/token.st → ...uthenticationForm.class/instance/token.st
View file
File renamed without changes.
0 ...e/SPBUserAuth.class/instance/username..st → ...nticationForm.class/instance/username..st
View file
File renamed without changes.
0 ...ge/SPBUserAuth.class/instance/username.st → ...enticationForm.class/instance/username.st
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/SPBUserAuth.class/methodProperties.json → ...nticationForm.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"actionToken:" : "lo 7/13/2022 19:25",
"actionUsername" : "lo 7/13/2022 19:21",
"actionUsername:" : "lo 7/13/2022 19:25",
"buildButtons:" : "lo 8/1/2022 14:18",
"buildButtons:" : "mcr 8/2/2022 16:48",
"buildInputFields:" : "lo 8/1/2022 14:19",
"buildInputPanel:" : "lo 8/1/2022 14:19",
"buildWith:" : "lo 8/1/2022 10:51",
Expand Down
2 changes: 1 addition & 1 deletion ...package/SPBUserAuth.class/properties.json → ...BAuthenticationForm.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"instvars" : [
"token",
"username" ],
"name" : "SPBUserAuth",
"name" : "SPBAuthenticationForm",
"pools" : [
],
"super" : "Model",
Expand Down
0 ...quelloCoreServiceProvider.class/README.md → ....package/SPBAuthenticator.class/README.md
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/class/newWith..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
instance creation
newWith: anSPBGithubBoardProvider

| instance |
instance := self new.
instance boardProvider: anSPBGithubBoardProvider.
^ instance.
11 changes: 11 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/authenticate.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
authentication
authenticate

self checkIfCredentialsMissing
ifTrue: [SPBAuthenticationForm open].

self checkIfCredentialsMissing
ifTrue: [self errorAuthenticationCanceled. Error signal].

[self checkIfTokenValidFor]
on: Error do: [Error signal].
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/boardProvider..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
boardProvider: anSPBGithubBoardProvider

boardProvider := anSPBGithubBoardProvider.
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/boardProvider.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
boardProvider

^ boardProvider.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/checkIfCredentialsMissing.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
authentication
checkIfCredentialsMissing

self username: SPBGithubAPI username.
self token: SPBGithubAPI token.

^ username isNil or: [token isNil].
16 changes: 16 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/checkIfTokenValidFor.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
authentication
checkIfTokenValidFor

| tokenScopes repo |
[tokenScopes := self getTokenScopes]
on: Error do: [Error signal].

"test if you can query the repo with this token"
repo := self boardProvider getRepo.
repo message = 'Not Found'
ifTrue:
[(tokenScopes includes: 'repo')
ifTrue: [self errorRepoNotFound].
(tokenScopes includes: 'public_repo')
ifTrue: [self errorInvalidTokenScopes]].

6 changes: 6 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/errorAuthenticationCanceled.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
errors
errorAuthenticationCanceled

UserDialogBoxMorph
inform: 'Authentication dialog was dismissed' title: 'Operation canceled'.
^ Error signal.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/errorGarbageToken.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
errors
errorGarbageToken

UserDialogBoxMorph
inform: 'Not a valid token' title: 'Operation canceled'.
SPBGithubAPI token: nil.
^ Error signal.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/errorInvalidTokenScopes.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
errors
errorInvalidTokenScopes

UserDialogBoxMorph
inform: 'Invalid token or username or repository is private. Token has only public_repo scope' title: 'Operation canceled'.
SPBGithubAPI token: nil.
^ Error signal.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/errorNoScopes.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
errors
errorNoScopes

UserDialogBoxMorph
inform: 'Make sure the token has repo or public_repo scope' title: 'Operation cancelled'.
SPBGithubAPI token: nil.
^ Error signal.
6 changes: 6 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/errorRepoNotFound.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
errors
errorRepoNotFound

UserDialogBoxMorph
inform: 'Make sure you have access to the repository' title: 'Repository not found'.
^ Error signal.
9 changes: 9 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/getRepoFromUrl..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
authentication
getRepoFromUrl: aString

| pathComponents url |
url := aString asUrl.
pathComponents := url fullPath splitBy: '/'.
self boardProvider user: (pathComponents at: 2).
self boardProvider repo: (pathComponents at: 3).
^ self boardProvider getRepo.
13 changes: 13 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/getTokenScopes.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
authentication
getTokenScopes

| tokenScopes |
tokenScopes := self boardProvider getTokenOAuthScopes.
tokenScopes isEmpty
ifTrue: [self errorGarbageToken].

(((tokenScopes includes: 'repo') not) and: [(tokenScopes includes: 'public_repo') not])
ifTrue: [self errorNoScopes].
^ tokenScopes.


4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/token..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
token: aString

token := aString.
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/token.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
token

^ token.
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/username..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
username: aString

username := aString.
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/instance/username.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
username

^ username.
20 changes: 20 additions & 0 deletions Squello-Core.package/SPBAuthenticator.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"class" : {
"newWith:" : "mcr 8/2/2022 17:38" },
"instance" : {
"authenticate" : "mcr 8/2/2022 22:48",
"boardProvider" : "mcr 8/2/2022 18:26",
"boardProvider:" : "mcr 8/2/2022 18:26",
"checkIfCredentialsMissing" : "mcr 8/2/2022 18:27",
"checkIfTokenValidFor" : "mcr 8/2/2022 22:48",
"errorAuthenticationCanceled" : "mcr 8/2/2022 21:49",
"errorGarbageToken" : "mcr 8/2/2022 22:08",
"errorInvalidTokenScopes" : "mcr 8/2/2022 22:54",
"errorNoScopes" : "mcr 8/2/2022 22:31",
"errorRepoNotFound" : "mcr 8/2/2022 21:50",
"getRepoFromUrl:" : "mcr 8/2/2022 20:47",
"getTokenScopes" : "mcr 8/2/2022 22:38",
"token" : "mcr 8/2/2022 18:26",
"token:" : "mcr 8/2/2022 18:26",
"username" : "mcr 8/2/2022 18:27",
"username:" : "mcr 8/2/2022 18:27" } }
8 changes: 5 additions & 3 deletions ...CoreServiceProvider.class/properties.json → ...ge/SPBAuthenticator.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
],
"commentStamp" : "",
"instvars" : [
],
"name" : "SquelloCoreServiceProvider",
"boardProvider",
"token",
"username" ],
"name" : "SPBAuthenticator",
"pools" : [
],
"super" : "ServiceProvider",
"super" : "Object",
"type" : "normal" }
5 changes: 5 additions & 0 deletions Squello-Core.package/SPBBoard.class/class/errorParsingUrl.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
startup
errorParsingUrl

UserDialogBoxMorph
inform: 'Invalid repository Url' title: 'Error parsing Url'.
24 changes: 12 additions & 12 deletions Squello-Core.package/SPBBoard.class/class/newWith..st
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
startup
newWith: aString

| instance username token |
| instance authenticator |
instance := self new.
username := SPBGithubAPI username.
token := SPBGithubAPI token.

(username isNil or: [token isNil]) ifTrue: [SPBUserAuth open].
(username isNil or: [token isNil]) ifTrue: [^ UserDialogBoxMorph inform: 'Authentication dialog was dismissed' title: 'Operation canceled'].

(aString beginsWith: 'https://github.com/') ifFalse:
[^ UserDialogBoxMorph inform: 'Invalid repository url' asString title: 'Operation canceled'].

instance
loadProject: aString;
buildAndOpen.
[instance parseRepoFromUrl: aString]
on: Error do: [self errorParsingUrl. ^ self].

authenticator := SPBAuthenticator newWith: instance boardProvider.
[authenticator authenticate]
on: Error do: [^ self].

[instance loadProject: aString]
on: Error do: [^ self].

instance buildAndOpen.
^ instance.
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoard.class/class/open.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ startup
open

| prompt |
prompt := FillInTheBlank request: 'Please enter GitHub URL of your project board:' initialAnswer: (self lastProject ifNotNil: [self lastProject] ifNil: ['']) onCancelReturn: ''.
prompt := FillInTheBlank request: 'Please enter GitHub URL of your project board or your repository:' initialAnswer: (self lastProject ifNotNil: [self lastProject] ifNil: ['']) onCancelReturn: ''.
prompt = '' ifTrue: [^ self].
self lastProject: prompt.
^self newWith: prompt.
Expand Down
8 changes: 5 additions & 3 deletions Squello-Core.package/SPBBoard.class/instance/errorInvalidUrl.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
toolbuilder
initialize-release
errorInvalidUrl

UserDialogBoxMorph inform: 'Invalid repository url' title: 'Operation canceled'.

UserDialogBoxMorph
inform: 'Invalid repository Url or project does not exist' title: 'Operation canceled'.
^ Error signal.
6 changes: 6 additions & 0 deletions Squello-Core.package/SPBBoard.class/instance/errorNoProjects.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
initialize-release
errorNoProjects

UserDialogBoxMorph
inform: 'Repository has no projects' title: 'Operation canceled'.
^ Error signal.
3 changes: 2 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/loadProject..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ loadProject: aString
(aString includesSubstring: '/projects')
ifTrue: [[self boardProvider parseInputBoardUrl: aString]
on: Error
do: [^ self errorInvalidUrl]]
do: [^ self errorInvalidUrl.]]
ifFalse: [[projects := (self boardProvider getProjects: aString)]
on: Error
do: [^ self errorInvalidUrl].
projects isEmpty ifTrue: [self errorNoProjects].
projectNames := projects
collect: [:project | project at: 'name'].
chosenProject := UIManager default
Expand Down
9 changes: 9 additions & 0 deletions Squello-Core.package/SPBBoard.class/instance/parseRepoFromUrl..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
initialize-release
parseRepoFromUrl: aString

| pathComponents url |
url := aString asUrl.
pathComponents := url fullPath splitBy: '/'.
self boardProvider user: (pathComponents at: 2).
self boardProvider repo: (pathComponents at: 3).
^ self boardProvider getRepo.
11 changes: 7 additions & 4 deletions Squello-Core.package/SPBBoard.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"class" : {
"columnMinimumExtent" : "lo 8/1/2022 13:40",
"errorParsingUrl" : "mcr 8/2/2022 22:23",
"lastProject" : "tk 7/30/2022 21:54",
"lastProject:" : "tk 7/30/2022 21:54",
"newWith:" : "NTK 7/30/2022 11:50",
"open" : "NTK 6/1/2022 16:41",
"newWith:" : "mcr 8/2/2022 22:48",
"open" : "mcr 8/2/2022 22:32",
"registerInAppsMenu" : "lo 6/4/2022 23:19" },
"instance" : {
"activeCard" : "mcr 8/1/2022 02:31",
Expand Down Expand Up @@ -44,9 +45,11 @@
"createColumns" : "lo 8/1/2022 11:11",
"createSidebar" : "lo 8/1/2022 11:11",
"errorCannotAddColumn:" : "jh 7/31/2022 14:28",
"errorInvalidUrl" : "jh 7/31/2022 14:28",
"errorInvalidUrl" : "mcr 8/2/2022 22:17",
"errorNoProjects" : "mcr 8/2/2022 22:15",
"initialize" : "jh 7/29/2022 11:36",
"loadProject:" : "lo 8/1/2022 14:22",
"loadProject:" : "mcr 8/2/2022 22:15",
"parseRepoFromUrl:" : "mcr 8/2/2022 21:15",
"removeColumn:" : "lo 8/1/2022 14:09",
"rerenderColumns" : "lo 7/31/2022 16:42",
"resizeColumnArea" : "lo 8/1/2022 11:12",
Expand Down
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBGithubAPI.class/instance/getRequestToURL..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ getRequestToURL: aString
request := self createGetRequestTo: aString.
response := (WebClient new initializeFromUrl: aString) sendRequest: request.
stream := ReadStream on: response content from: 1 to: response content byteSize.

^ Json readFrom: stream.
8 changes: 8 additions & 0 deletions Squello-Core.package/SPBGithubAPI.class/instance/getRequestToURLHeaderOnly..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
request creation/sending
getRequestToURLHeaderOnly: aString

| request response |
request := self createGetRequestTo: aString.
response := (WebClient new initializeFromUrl: aString) sendRequest: request.

^ response headers.
10 changes: 10 additions & 0 deletions Squello-Core.package/SPBGithubAPI.class/instance/getRequestToURLWithoutAuth..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
request creation/sending
getRequestToURLWithoutAuth: aString

| request response stream |
request := self createGetRequestTo: aString.
request removeHeader: 'Authorization'.
response := (WebClient new initializeFromUrl: aString) sendRequest: request.
stream := ReadStream on: response content from: 1 to: response content byteSize.

^ Json readFrom: stream.
9 changes: 9 additions & 0 deletions Squello-Core.package/SPBGithubAPI.class/instance/queryScopeHeaderOnly..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
api calls get request
queryScopeHeaderOnly: aString

| url request response |
url := 'https://api.github.com/users/' , aString.
request := self createGetRequestTo: url.
response := (WebClient new initializeFromUrl: url) sendRequest: request.

^ response headersAt: 'X-OAuth-Scopes'.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBGithubAPI.class/instance/queryUser.repo..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
api calls get request
queryUser: aString repo: anotherString

| url |
url := 'https://api.github.com/repos/', aString, '/', anotherString.

^ self getRequestToURL: url.
Loading

0 comments on commit 07f17df

Please sign in to comment.