Compare commits
	
		
			59 Commits
		
	
	
		
			v1.0.4
			...
			0be0c38fb1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 0be0c38fb1 | ||
| d946069f6a | |||
| cdbfe64f5c | |||
|   | 6eb24cc601 | ||
| 2b61ef233d | |||
| d6148f289a | |||
|   | e1987287e3 | ||
| 98d2a6c3b2 | |||
| 1e0ddbc0ee | |||
|   | 22607d3601 | ||
| a553e9e93a | |||
| 63f764d1c5 | |||
|   | 19ddd10164 | ||
| 97aae89ce9 | |||
| 1af505196a | |||
|   | 02b33167ef | ||
| 98ea369664 | |||
| 62c27305f9 | |||
|   | 7864ed98e6 | ||
| 57d7e0cc69 | |||
| c29340669c | |||
|   | ae06c8fd14 | ||
| 407895337b | |||
| 1d026d3ec4 | |||
|   | f4161b47d7 | ||
| b7e8d6ad5a | |||
| ef817dc650 | |||
|   | c33b246cf2 | ||
| 6d5b17515a | |||
| 9a6e8e25f2 | |||
|   | 9126817665 | ||
| dccca37237 | |||
| 446999ac69 | |||
|   | b1f6a4666c | ||
| fdf1501152 | |||
| 774e302ce7 | |||
|   | f5f3b38299 | ||
| 09dabc1c18 | |||
| 7b69a765e2 | |||
|   | cf149957cc | ||
| d8fbb60e3b | |||
| bb4bd5111f | |||
|   | d864e11320 | ||
| 907fc9249c | |||
| 4adb8cd382 | |||
| 216c955e68 | |||
| d38686dc01 | |||
|   | f787b14939 | ||
| e232eb7d8d | |||
| 44bf4e4888 | |||
|   | a7dedbe6db | ||
| f02370d5bc | |||
| 3dbfb4a917 | |||
|   | ddb220a889 | ||
| ddbc209324 | |||
| b4d866bbe8 | |||
|   | 4f14b47137 | ||
| 905f2aed8e | |||
| 3a0c288e55 | 
| @@ -54,6 +54,7 @@ jobs: | ||||
|       - name: Kaniko build | ||||
|         uses: aevea/action-kaniko@master | ||||
|         with: | ||||
|           # extra_args: -v debug | ||||
|           registry: code.spamasaurus.com | ||||
|           image: djpbessems/spamasaurusrex | ||||
|           username: ${{ secrets.GIT_USERNAME }} | ||||
|   | ||||
							
								
								
									
										133
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										133
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,3 +1,136 @@ | ||||
| ## [1.0.23](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.22...v1.0.23) (2024-03-11) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Register type with gob interface ([cdbfe64](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/cdbfe64f5c04ac7d19ae14ca9ff826d2990dc065)) | ||||
|  | ||||
| ## [1.0.22](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.21...v1.0.22) (2024-03-11) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add multiple verbose debugging ([d6148f2](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/d6148f289aa113f8325813e76bd039342987337a)) | ||||
|  | ||||
| ## [1.0.21](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.20...v1.0.21) (2024-03-11) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add verbose debugging after session store ([1e0ddbc](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/1e0ddbc0eea9f97839954ac6b24c99feb4be6447)) | ||||
|  | ||||
| ## [1.0.20](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.19...v1.0.20) (2024-03-11) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add more debug logging ([63f764d](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/63f764d1c56c5f66c15ef9cdf9139fabd4c3d8a4)) | ||||
|  | ||||
| ## [1.0.19](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.18...v1.0.19) (2024-03-11) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add error handling to session store ([1af5051](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/1af505196ad217b91169cdac771de2ec0a35482f)) | ||||
|  | ||||
| ## [1.0.18](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.17...v1.0.18) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Replace incorrect http status code ([62c2730](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/62c27305f9ec1c922384ec8c44736414e79f8327)) | ||||
|  | ||||
| ## [1.0.17](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.16...v1.0.17) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Remove superfluous response write ([c293406](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/c29340669ce60e19aca391ac19da3b9d275f1687)) | ||||
|  | ||||
| ## [1.0.16](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.15...v1.0.16) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Change oath scopes & direct debugging to console. ([1d026d3](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/1d026d3ec450c94f3e0401d35f858db1627f6ef7)) | ||||
|  | ||||
| ## [1.0.15](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.14...v1.0.15) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Check for existing session w/ token ([ef817dc](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/ef817dc650f36d170bc254158e4a9c789cee6693)) | ||||
|  | ||||
| ## [1.0.14](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.13...v1.0.14) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add more extensive oauth scope ([9a6e8e2](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/9a6e8e25f29d38dd3e66530d37445a5d5902db56)) | ||||
|  | ||||
| ## [1.0.13](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.12...v1.0.13) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Replace clientSecret value ([446999a](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/446999ac69b38271c15a907beaad5f25b3363d5f)) | ||||
|  | ||||
| ## [1.0.12](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.11...v1.0.12) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add callback debugging ([774e302](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/774e302ce749f004e97650d05694162780e009d8)) | ||||
|  | ||||
| ## [1.0.11](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.10...v1.0.11) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Remove redundant slash character ([7b69a76](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/7b69a765e2b8371a285999360721df81abee74c9)) | ||||
|  | ||||
| ## [1.0.10](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.9...v1.0.10) (2024-03-10) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Refactor to use oauth2 package ([bb4bd51](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/bb4bd5111f4ca16fd43aeea3ae8c4ea0adda2090)) | ||||
|  | ||||
| ## [1.0.9](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.8...v1.0.9) (2024-03-09) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Refactor to different client method ([216c955](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/216c955e68908d523a84cafd6cf182f9583e104e)) | ||||
|  | ||||
| ## [1.0.8](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.7...v1.0.8) (2024-03-09) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Replace bogus scope with correct value ([44bf4e4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/44bf4e4888738afebd28ad717153113753afd5f2)) | ||||
|  | ||||
| ## [1.0.7](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.6...v1.0.7) (2024-03-09) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Expand scope of debugging variable ([3dbfb4a](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3dbfb4a917fa5f886c52f0ae11c1cab73ecb7713)) | ||||
|  | ||||
| ## [1.0.6](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.5...v1.0.6) (2024-03-09) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Add verbose debugging output ([b4d866b](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/b4d866bbe8cf3f9632fdf69de4f15779c0099a9f)) | ||||
|  | ||||
| ## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08) | ||||
|  | ||||
|  | ||||
| ### Bug Fixes | ||||
|  | ||||
| * Rebase to MSAL library for authentication ([3a0c288](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3a0c288e55d4a717fa89f9548c5006e6c6bd7969)) | ||||
|  | ||||
| ## [1.0.4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.3...v1.0.4) (2024-03-08) | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -14,6 +14,6 @@ WORKDIR /app | ||||
|  | ||||
| COPY --from=builder /app/main . | ||||
|  | ||||
| EXPOSE 80 | ||||
| EXPOSE 8080 | ||||
|  | ||||
| CMD ["./main"] | ||||
|   | ||||
							
								
								
									
										14
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								go.mod
									
									
									
									
									
								
							| @@ -5,16 +5,22 @@ go 1.19 | ||||
| require ( | ||||
| 	github.com/breml/rootcerts v0.2.16 | ||||
| 	github.com/gorilla/mux v1.8.1 | ||||
| 	github.com/gorilla/sessions v1.2.2 | ||||
| 	github.com/microsoftgraph/msgraph-sdk-go v1.34.0 | ||||
| 	golang.org/x/oauth2 v0.18.0 | ||||
| ) | ||||
|  | ||||
| require ( | ||||
| 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect | ||||
| 	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect | ||||
| 	github.com/golang/protobuf v1.5.3 // indirect | ||||
| 	github.com/gorilla/securecookie v1.1.2 // indirect | ||||
| 	github.com/kylelemons/godebug v1.1.0 // indirect | ||||
| 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect | ||||
| 	golang.org/x/crypto v0.18.0 // indirect | ||||
| 	golang.org/x/sys v0.16.0 // indirect | ||||
| 	golang.org/x/crypto v0.21.0 // indirect | ||||
| 	golang.org/x/sys v0.18.0 // indirect | ||||
| 	google.golang.org/appengine v1.6.7 // indirect | ||||
| 	google.golang.org/protobuf v1.31.0 // indirect | ||||
| ) | ||||
|  | ||||
| require ( | ||||
| @@ -22,7 +28,7 @@ require ( | ||||
| 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 | ||||
| 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect | ||||
| 	github.com/cjlapao/common-go v0.0.39 // indirect | ||||
| 	github.com/davecgh/go-spew v1.1.1 // indirect | ||||
| 	github.com/davecgh/go-spew v1.1.1 | ||||
| 	github.com/go-logr/logr v1.4.1 // indirect | ||||
| 	github.com/go-logr/stdr v1.2.2 // indirect | ||||
| 	github.com/google/uuid v1.6.0 // indirect | ||||
| @@ -40,7 +46,7 @@ require ( | ||||
| 	go.opentelemetry.io/otel v1.22.0 // indirect | ||||
| 	go.opentelemetry.io/otel/metric v1.22.0 // indirect | ||||
| 	go.opentelemetry.io/otel/trace v1.22.0 // indirect | ||||
| 	golang.org/x/net v0.20.0 // indirect | ||||
| 	golang.org/x/net v0.22.0 // indirect | ||||
| 	golang.org/x/text v0.14.0 // indirect | ||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||
| ) | ||||
|   | ||||
							
								
								
									
										37
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										37
									
								
								go.sum
									
									
									
									
									
								
							| @@ -20,11 +20,21 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= | ||||
| github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= | ||||
| github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= | ||||
| github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= | ||||
| github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | ||||
| github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= | ||||
| github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= | ||||
| github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= | ||||
| github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||
| github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= | ||||
| github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= | ||||
| github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= | ||||
| github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||
| github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= | ||||
| github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= | ||||
| github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= | ||||
| github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= | ||||
| github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY= | ||||
| github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= | ||||
| github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= | ||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||
| github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= | ||||
| @@ -61,15 +71,30 @@ go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er | ||||
| go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= | ||||
| go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= | ||||
| go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= | ||||
| golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= | ||||
| golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= | ||||
| golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= | ||||
| golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= | ||||
| golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= | ||||
| golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | ||||
| golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= | ||||
| golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= | ||||
| golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= | ||||
| golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= | ||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= | ||||
| golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||
| golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= | ||||
| golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||
| golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= | ||||
| golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||
| google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= | ||||
| google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= | ||||
| google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= | ||||
| google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= | ||||
| google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= | ||||
| google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= | ||||
| gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= | ||||
|   | ||||
| @@ -2,59 +2,45 @@ package main | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"encoding/gob" | ||||
| 	"log" | ||||
| 	"net/http" | ||||
| 	"os" | ||||
| 	"os/signal" | ||||
| 	"pkg/spamasaurusrex/pkg/graphhelper" | ||||
| 	"syscall" | ||||
| 	"time" | ||||
|  | ||||
| 	_ "github.com/breml/rootcerts" | ||||
| 	"github.com/davecgh/go-spew/spew" | ||||
|  | ||||
| 	"github.com/gorilla/mux" | ||||
| 	"github.com/gorilla/sessions" | ||||
|  | ||||
| 	"golang.org/x/oauth2" | ||||
| 	"golang.org/x/oauth2/microsoft" | ||||
| ) | ||||
|  | ||||
| func handler(w http.ResponseWriter, r *http.Request) { | ||||
| 	graphHelper := graphhelper.NewGraphHelper() | ||||
| 	initializeGraph(graphHelper) | ||||
|  | ||||
| 	user, err := graphHelper.GetUser() | ||||
| 	if err != nil { | ||||
| 		log.Panicf("Error getting user: %v\n", err) | ||||
| var config = oauth2.Config{ | ||||
| 	ClientID:     "dccb4b93-3f75-4775-a94a-da39216d7daf", | ||||
| 	ClientSecret: "XN98Q~Wrp1RfakkihA1BaTKfokOSX9fuB01unanr", | ||||
| 	Endpoint:     microsoft.AzureADEndpoint("ceeae22e-f163-4ac9-b7c2-45972d3aed4f"), | ||||
| 	RedirectURL:  "https://alias.spamasaurus.com/callback", | ||||
| 	Scopes:       []string{"email", "openid", "profile", "user.read"}, | ||||
| } | ||||
|  | ||||
| 	fmt.Printf("Hello, %s!\n", *user.GetDisplayName()) | ||||
| 	w.Write([]byte(fmt.Sprintf("Hello, %s\n", *user.GetDisplayName()))) | ||||
| var sessionStore = sessions.NewCookieStore([]byte("xDDBjhYwyndZty3exGNq2ahE8wHRCR4DfdCJCSoWXAYncfWw2UQDH63QcJ9CkrGx")) | ||||
|  | ||||
| 	// query := r.URL.Query() | ||||
| 	// name := query.Get("name") | ||||
| 	// w.Write([]byte(fmt.Sprintf("Hello, %s\n", name))) | ||||
| } | ||||
|  | ||||
| func healthHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	w.WriteHeader(http.StatusOK) | ||||
| } | ||||
|  | ||||
| func loginHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	clientId := "dccb4b93-3f75-4775-a94a-da39216d7daf" | ||||
| 	tenantId := "ceeae22e-f163-4ac9-b7c2-45972d3aed4f" | ||||
| 	redirectURI := "https://alias.spamasaurus.com/" | ||||
|  | ||||
| 	http.Redirect(w, r, | ||||
| 		"https://login.microsoftonline.com/"+tenantId+"/oauth2/v2.0/authorize?client_id="+clientId+"&response_type=code&redirect_uri="+redirectURI+"&scope=openid profile offline_access", http.StatusMovedPermanently) | ||||
| } | ||||
|  | ||||
| func readinessHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	w.WriteHeader(http.StatusOK) | ||||
| func init() { | ||||
| 	// Register the oauth2.Token type with gob | ||||
| 	gob.Register(&oauth2.Token{}) | ||||
| } | ||||
|  | ||||
| func main() { | ||||
| 	r := mux.NewRouter() | ||||
|  | ||||
| 	r.HandleFunc("/", handler) | ||||
| 	r.HandleFunc("/", rootHandler) | ||||
| 	r.HandleFunc("/health", healthHandler) | ||||
| 	r.HandleFunc("/login", loginHandler) | ||||
| 	r.HandleFunc("/callback", callbackHandler) | ||||
| 	r.HandleFunc("/readiness", readinessHandler) | ||||
|  | ||||
| 	srv := &http.Server{ | ||||
| @@ -76,6 +62,64 @@ func main() { | ||||
| 	waitForShutdown(srv) | ||||
| } | ||||
|  | ||||
| func rootHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	session, err := sessionStore.Get(r, "spamasaurusRex") | ||||
| 	if err != nil { | ||||
| 		log.Println(spew.Sdump(err)) | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	if token, ok := session.Values["token"]; ok { | ||||
| 		log.Println(spew.Sdump(token)) | ||||
| 		w.Write([]byte("Token retrieved from session")) | ||||
| 	} else { | ||||
| 		log.Println(spew.Sdump(session)) | ||||
| 		url := config.AuthCodeURL("state", oauth2.AccessTypeOffline) | ||||
| 		http.Redirect(w, r, url, http.StatusFound) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func callbackHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	// Handle the callback after successful authentication | ||||
| 	token, err := config.Exchange(r.Context(), r.URL.Query().Get("code")) | ||||
| 	if err != nil { | ||||
| 		if retrieveErr, ok := err.(*oauth2.RetrieveError); ok { | ||||
| 			log.Println(retrieveErr.ErrorDescription + " (" + retrieveErr.ErrorCode + ")") | ||||
| 		} | ||||
| 		http.Error(w, "Error exchanging code for token", http.StatusInternalServerError) | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	// Store the token in the session | ||||
| 	session, err := sessionStore.Get(r, "spamasaurusRex") | ||||
| 	if err != nil { | ||||
| 		log.Println(spew.Sdump(err)) | ||||
| 		return | ||||
| 	} | ||||
| 	session.Values["token"] = token | ||||
|  | ||||
| 	err = session.Save(r, w) | ||||
| 	if err != nil { | ||||
| 		log.Println(spew.Sdump(err)) | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	log.Println(spew.Sdump(session)) | ||||
|  | ||||
| 	// w.Write([]byte("Authentication successful!")) | ||||
|  | ||||
| 	url := "https://alias.spamasaurus.com" | ||||
| 	http.Redirect(w, r, url, http.StatusSeeOther) | ||||
| } | ||||
|  | ||||
| func healthHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	w.WriteHeader(http.StatusOK) | ||||
| } | ||||
|  | ||||
| func readinessHandler(w http.ResponseWriter, r *http.Request) { | ||||
| 	w.WriteHeader(http.StatusOK) | ||||
| } | ||||
|  | ||||
| func waitForShutdown(srv *http.Server) { | ||||
| 	interruptChan := make(chan os.Signal, 1) | ||||
| 	signal.Notify(interruptChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) | ||||
| @@ -91,24 +135,3 @@ func waitForShutdown(srv *http.Server) { | ||||
| 	log.Println("Shutting down") | ||||
| 	os.Exit(0) | ||||
| } | ||||
|  | ||||
| func initializeGraph(graphHelper *graphhelper.GraphHelper) { | ||||
| 	err := graphHelper.InitializeGraphForUserAuth() | ||||
| 	if err != nil { | ||||
| 		log.Panicf("Error initializing Graph for user auth: %v\n", err) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func displayAccessToken(graphHelper *graphhelper.GraphHelper) { | ||||
| 	token, err := graphHelper.GetUserToken() | ||||
| 	if err != nil { | ||||
| 		log.Panicf("Error getting user token: %v\n", err) | ||||
| 	} | ||||
|  | ||||
| 	fmt.Printf("User token: %s", *token) | ||||
| 	fmt.Println() | ||||
| } | ||||
|  | ||||
| func makeGraphCall(graphHelper *graphhelper.GraphHelper) { | ||||
| 	// TODO | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user