mirror of
https://github.com/router-for-me/CLIProxyAPIPlus.git
synced 2026-05-20 04:55:40 +08:00
75793a18f0
为Kiro供应商添加WEB UI OAuth登录入口和认证文件过滤器 ## Changes / 更改内容 ### Frontend / 前端 (management.html) - Add Kiro OAuth card UI with support for AWS Builder ID, Google, and GitHub login methods - 添加Kiro OAuth卡片UI，支持AWS Builder ID、Google和GitHub三种登录方式 - Add i18n translations for Kiro OAuth (Chinese and English) - 添加Kiro OAuth的中英文国际化翻译 - Add Kiro filter button in auth files management page - 在认证文件管理页面添加Kiro过滤按钮 - Implement JavaScript methods: startKiroOAuth(), openKiroLink(), copyKiroLink(), copyKiroDeviceCode(), startKiroOAuthPolling(), resetKiroOAuthUI() - 实现JavaScript方法：startKiroOAuth()、openKiroLink()、copyKiroLink()、copyKiroDeviceCode()、startKiroOAuthPolling()、resetKiroOAuthUI() ### Backend / 后端 - Add /kiro-auth-url endpoint for Kiro OAuth authentication (auth_files.go) - 添加/kiro-auth-url端点用于Kiro OAuth认证 (auth_files.go) - Fix GetAuthStatus() to correctly parse device_code and auth_url status - 修复GetAuthStatus()以正确解析device_code和auth_url状态 - Change status delimiter from ':' to '|' to avoid URL parsing issues - 将状态分隔符从':'改为'|'以避免URL解析问题 - Export CreateToken method in social_auth.go - 在social_auth.go中导出CreateToken方法 - Register Kiro OAuth routes in server.go - 在server.go中注册Kiro OAuth路由 ## Files Modified / 修改的文件 - management.html - internal/api/handlers/management/auth_files.go - internal/api/server.go - internal/auth/kiro/social_auth.go
56 lines
1.9 KiB
Go
56 lines
1.9 KiB
Go
// Package util provides utility functions for the CLI Proxy API server.
|
|
// It includes helper functions for proxy configuration, HTTP client setup,
|
|
// log level management, and other common operations used across the application.
|
|
package util
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/router-for-me/CLIProxyAPI/v6/sdk/config"
|
|
log "github.com/sirupsen/logrus"
|
|
"golang.org/x/net/proxy"
|
|
)
|
|
|
|
// SetProxy configures the provided HTTP client with proxy settings from the configuration.
|
|
// It supports SOCKS5, HTTP, and HTTPS proxies. The function modifies the client's transport
|
|
// to route requests through the configured proxy server.
|
|
func SetProxy(cfg *config.SDKConfig, httpClient *http.Client) *http.Client {
|
|
var transport *http.Transport
|
|
// Attempt to parse the proxy URL from the configuration.
|
|
proxyURL, errParse := url.Parse(cfg.ProxyURL)
|
|
if errParse == nil {
|
|
// Handle different proxy schemes.
|
|
if proxyURL.Scheme == "socks5" {
|
|
// Configure SOCKS5 proxy with optional authentication.
|
|
var proxyAuth *proxy.Auth
|
|
if proxyURL.User != nil {
|
|
username := proxyURL.User.Username()
|
|
password, _ := proxyURL.User.Password()
|
|
proxyAuth = &proxy.Auth{User: username, Password: password}
|
|
}
|
|
dialer, errSOCKS5 := proxy.SOCKS5("tcp", proxyURL.Host, proxyAuth, proxy.Direct)
|
|
if errSOCKS5 != nil {
|
|
log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5)
|
|
return httpClient
|
|
}
|
|
// Set up a custom transport using the SOCKS5 dialer.
|
|
transport = &http.Transport{
|
|
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
return dialer.Dial(network, addr)
|
|
},
|
|
}
|
|
} else if proxyURL.Scheme == "http" || proxyURL.Scheme == "https" {
|
|
// Configure HTTP or HTTPS proxy.
|
|
transport = &http.Transport{Proxy: http.ProxyURL(proxyURL)}
|
|
}
|
|
}
|
|
// If a new transport was created, apply it to the HTTP client.
|
|
if transport != nil {
|
|
httpClient.Transport = transport
|
|
}
|
|
return httpClient
|
|
}
|