This is an automated email from the ASF dual-hosted git repository.
LinkinStars pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/answer-plugins.git
The following commit(s) were added to refs/heads/main by this push:
new 35d3da6 fix: encode Apache connector token requests
35d3da6 is described below
commit 35d3da647d2fc92da6b0e91e0a0bea50802c975c
Author: LinkinStars <[email protected]>
AuthorDate: Wed Nov 18 12:16:55 2026 +0800
fix: encode Apache connector token requests
---
connector-apache/apache.go | 9 +++++++-
connector-apache/apache_test.go | 47 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/connector-apache/apache.go b/connector-apache/apache.go
index 8107202..3342c7f 100644
--- a/connector-apache/apache.go
+++ b/connector-apache/apache.go
@@ -25,6 +25,7 @@ import (
"fmt"
"io"
"net/http"
+ "net/url"
"github.com/apache/answer-plugins/connector-apache/i18n"
"github.com/apache/answer-plugins/util"
@@ -39,6 +40,12 @@ var Info embed.FS
type Connector struct {
}
+func tokenURL(code string) string {
+ values := url.Values{}
+ values.Set("code", code)
+ return "https://oauth.apache.org/token?" + values.Encode()
+}
+
func init() {
plugin.Register(&Connector{})
}
@@ -81,7 +88,7 @@ func (g *Connector) ConnectorReceiver(ctx *plugin.GinContext,
receiverURL string
code := ctx.Query("code")
// exchange code for user info
- resp, err := http.Get("https://oauth.apache.org/token?code=" + code)
+ resp, err := http.Get(tokenURL(code))
if err != nil {
log.Errorf("get token failed: %v", err)
return userInfo, err
diff --git a/connector-apache/apache_test.go b/connector-apache/apache_test.go
new file mode 100644
index 0000000..5ef9d6c
--- /dev/null
+++ b/connector-apache/apache_test.go
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package apache
+
+import (
+ "net/url"
+ "testing"
+)
+
+func TestTokenURLPreservesCodeAsSingleParameter(t *testing.T) {
+ for _, code := range []string{
+ "normal-code",
+ "code+with spaces",
+ "code%2Fvalue",
+ "code&grant_type=client_credentials",
+ "授权码",
+ } {
+ tokenEndpoint, err := url.Parse(tokenURL(code))
+ if err != nil {
+ t.Fatalf("parse token URL: %v", err)
+ }
+ if tokenEndpoint.Scheme != "https" || tokenEndpoint.Host !=
"oauth.apache.org" || tokenEndpoint.Path != "/token" {
+ t.Fatalf("unexpected token endpoint: %s", tokenEndpoint)
+ }
+ query := tokenEndpoint.Query()
+ if len(query) != 1 || query.Get("code") != code {
+ t.Errorf("tokenURL(%q) query = %#v, want only code=%q",
code, query, code)
+ }
+ }
+}