From cf36b91ca05c5ad51f62222d9a3a44259ad357d9 Mon Sep 17 00:00:00 2001 From: carlhus Date: Wed, 19 Aug 2026 05:30:57 +0000 Subject: [PATCH 1/2] fix: update OAuth token request for JWT support --- backend/webui_context/context.go | 9 +++++++-- go.mod | 2 ++ go.sum | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/backend/webui_context/context.go b/backend/webui_context/context.go index c3ba4b5..bb058c5 100644 --- a/backend/webui_context/context.go +++ b/backend/webui_context/context.go @@ -165,8 +165,13 @@ func (c *WEBUIContext) GetTokenCtx(serviceName models.Nrf_NFMgmt_ServiceName, ta } logger.ConsumerLog.Infoln("GetTokenCtx:", targetNF, serviceName) - return oauth.GetTokenCtx(models.Nrf_NFMgmt_NFType_AF, targetNF, - c.NfInstanceID, c.NrfUri, string(serviceName)) + return oauth.GetTokenCtx(oauth.TokenRequest{ + ConsumerNFType: models.Nrf_NFMgmt_NFType_AF, + ConsumerNFInstanceID: c.NfInstanceID, + TargetNFType: targetNF, + NRFURI: c.NrfUri, + Scope: string(serviceName), + }) } // NewRequestWithContext() will not apply header in ctx diff --git a/go.mod b/go.mod index 83c082a..6c8b7e2 100644 --- a/go.mod +++ b/go.mod @@ -23,6 +23,8 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) +replace github.com/free5gc/openapi => github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021 + require ( cloud.google.com/go/compute/metadata v0.9.0 // indirect github.com/bytedance/sonic v1.11.6 // indirect diff --git a/go.sum b/go.sum index 62bf287..490f2d1 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,8 @@ github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021 h1:7NfiZk/ffa9fqvcGfwoE1xZ3j0ZOpW1o5U3YoVa2zIs= +github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021/go.mod h1:ggzAcwqg4JotSSdUvFFFruK6M0Yyr6mhBOCFaDHZmdE= github.com/casbin/casbin/v2 v2.31.6/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -155,8 +157,6 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/free5gc/chf v1.2.6-0.20260819160712-4e06244b5612 h1:B28Kfir2Glbc76iYDd9byhqY0Rsyv32+h1eJAt1jWo4= github.com/free5gc/chf v1.2.6-0.20260819160712-4e06244b5612/go.mod h1:2XC+DdZTpXdzL4Tog24FfGmISa11514B34vhd8ptn6o= -github.com/free5gc/openapi v1.3.0 h1:dVJ9FXM2qr8jesiHeTR9ZGZwYRmr7qcHx5Xgm/ip6s0= -github.com/free5gc/openapi v1.3.0/go.mod h1:ggzAcwqg4JotSSdUvFFFruK6M0Yyr6mhBOCFaDHZmdE= github.com/free5gc/smf v1.4.6-0.20260819160737-dd94a6c43508 h1:ST4LgftrkU6+kRvqLS5CP1wjDw+Yzs/85Ab3nu8hrH8= github.com/free5gc/smf v1.4.6-0.20260819160737-dd94a6c43508/go.mod h1:73OY0o2Hy3M+R4utx7JF1RzhMI9CU8QF6QxX5i+kKIE= github.com/free5gc/util v1.4.0 h1:vdjzRUgxEYtjIy6AYkO4JuIQHV8DqBb1paNqJiajeus= From 2b22871f4b1942568b1e7c577afa4c1fc10b3409 Mon Sep 17 00:00:00 2001 From: Zach1113 Date: Mon, 31 Aug 2026 14:08:14 +0000 Subject: [PATCH 2/2] feat: derive NRF instance ID from certificate --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c8b7e2..2f40aef 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -replace github.com/free5gc/openapi => github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021 +replace github.com/free5gc/openapi => github.com/carlhus/openapi v0.0.0-20260831123630-67c603f8c589 require ( cloud.google.com/go/compute/metadata v0.9.0 // indirect diff --git a/go.sum b/go.sum index 490f2d1..a371d5d 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021 h1:7NfiZk/ffa9fqvcGfwoE1xZ3j0ZOpW1o5U3YoVa2zIs= -github.com/carlhus/openapi v0.0.0-20260821053527-127c60ebf021/go.mod h1:ggzAcwqg4JotSSdUvFFFruK6M0Yyr6mhBOCFaDHZmdE= +github.com/carlhus/openapi v0.0.0-20260831123630-67c603f8c589 h1:P9g2fairdJ9HAlbPe+2PgIuudLcvCaONK3aQAunHDYU= +github.com/carlhus/openapi v0.0.0-20260831123630-67c603f8c589/go.mod h1:ixcBUsgwkQBAT/4peVVB0daqxk0qv6V8zOMSFvhKVfo= github.com/casbin/casbin/v2 v2.31.6/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=