Commit a87c359
committed
Catch host on_login hook exceptions and render generic denial
The on_login hook is host-app code. Before this change, if the host's
hook raised any non-ProvisioningError StandardError — a typo, a
NoMethodError on the claims hash, a failed external API call inside
the hook — the callback action crashed with a 500 instead of rendering
the existing access-denied flash.
UserProvisioner now wraps the hook invocation: gem-internal
ActiveAdmin::Oidc::Error subclasses still propagate untouched (so a
host can explicitly raise ProvisioningError with a custom message),
but any other StandardError is logged at :error level with the
original exception class and message, then re-raised as a generic
ProvisioningError. The controller already handles that — the user
sees the same clean denial flash as the 'hook returned false' path,
and ops gets the stack-level detail in the log.
Also introduces ActiveAdmin::Oidc.logger: a module-level logger
accessor that defaults to Rails.logger when Rails is booted and
falls back to a null logger otherwise. UserProvisioner uses it
instead of touching Rails.logger directly, which keeps the class
safe to call in unit-spec contexts that don't boot Rails and gives
tests a clean injection point (allow(ActiveAdmin::Oidc).to
receive(:logger)…).
Flips the existing 'propagates unrelated exceptions from the hook'
spec, which had calcified the old buggy behavior, and adds two new
examples covering the log line and the pass-through for gem-internal
errors.1 parent db3fc78 commit a87c359
3 files changed
Lines changed: 64 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
37 | 49 | | |
38 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
39 | 62 | | |
40 | 63 | | |
41 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
110 | 129 | | |
111 | 130 | | |
112 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
144 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
145 | 149 | | |
146 | | - | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
147 | 166 | | |
148 | 167 | | |
149 | 168 | | |
| |||
0 commit comments