Compare commits

...

1 Commits

Author SHA1 Message Date
appleboy be5114b976 feat: add CSRF crumb support and session management for Jenkins API
- Add support for Jenkins CSRF protection by managing and adding CSRF crumb to POST requests
- Store and cache CSRF crumb after fetching from Jenkins for session reuse
- Use an HTTP client with CookieJar for session management to support CSRF crumb handling
- Update existing tests to check for presence of CookieJar in the HTTP client
- Improve test servers to only count job trigger POSTs, ignoring GET requests for crumbs

fix #48

Signed-off-by: appleboy <appleboy.tw@gmail.com>
2025-12-27 10:42:00 +08:00
3 changed files with 83 additions and 15 deletions
+70 -10
View File
@@ -9,6 +9,7 @@ import (
"io" "io"
"log" "log"
"net/http" "net/http"
"net/http/cookiejar"
"net/url" "net/url"
"os" "os"
"strings" "strings"
@@ -32,6 +33,13 @@ type (
Token string // Remote trigger token Token string // Remote trigger token
Client *http.Client Client *http.Client
Debug bool // Enable debug mode to show detailed information Debug bool // Enable debug mode to show detailed information
crumb *CrumbResponse // Cached CSRF crumb
}
// CrumbResponse represents Jenkins crumb issuer response for CSRF protection
CrumbResponse struct {
Crumb string `json:"crumb"`
CrumbRequestField string `json:"crumbRequestField"`
} }
// QueueItem represents a Jenkins queue item response // QueueItem represents a Jenkins queue item response
@@ -144,14 +152,21 @@ func NewJenkins(
} }
} }
// Create HTTP client // Create CookieJar for session management (required for CSRF crumb)
client := http.DefaultClient jar, err := cookiejar.New(nil)
if tlsConfig != nil { if err != nil {
client = &http.Client{ return nil, fmt.Errorf("failed to create cookie jar: %w", err)
Transport: &http.Transport{
TLSClientConfig: tlsConfig,
},
} }
// Create HTTP Transport with optional TLS configuration
transport := &http.Transport{
TLSClientConfig: tlsConfig,
}
// Create HTTP client with CookieJar and Transport
client := &http.Client{
Jar: jar,
Transport: transport,
} }
return &Jenkins{ return &Jenkins{
@@ -175,10 +190,49 @@ func (jenkins *Jenkins) buildURL(path string, params url.Values) (requestURL str
return return
} }
func (jenkins *Jenkins) sendRequest(req *http.Request) (*http.Response, error) { // getCrumb fetches CSRF crumb from Jenkins
// Returns nil if CSRF protection is disabled on Jenkins
//
//nolint:unparam // Error return kept for future extensibility and API consistency
func (jenkins *Jenkins) getCrumb(ctx context.Context) (*CrumbResponse, error) {
// Return cached crumb if available
if jenkins.crumb != nil {
return jenkins.crumb, nil
}
path := "/crumbIssuer/api/json"
var crumb CrumbResponse
err := jenkins.get(ctx, path, nil, &crumb)
if err != nil {
// CSRF protection might be disabled, log and continue
if jenkins.Debug {
log.Printf("crumb not available (CSRF may be disabled): %v", err)
}
return nil, nil
}
// Cache the crumb for subsequent requests
jenkins.crumb = &crumb
if jenkins.Debug {
log.Printf("obtained crumb: %s=%s", crumb.CrumbRequestField, crumb.Crumb)
}
return jenkins.crumb, nil
}
func (jenkins *Jenkins) sendRequest(
req *http.Request,
crumb *CrumbResponse,
) (*http.Response, error) {
if jenkins.Auth != nil { if jenkins.Auth != nil {
req.SetBasicAuth(jenkins.Auth.Username, jenkins.Auth.Token) req.SetBasicAuth(jenkins.Auth.Username, jenkins.Auth.Token)
} }
// Add CSRF crumb header if available
if crumb != nil && crumb.CrumbRequestField != "" {
req.Header.Set(crumb.CrumbRequestField, crumb.Crumb)
}
return jenkins.Client.Do(req) return jenkins.Client.Do(req)
} }
@@ -195,7 +249,7 @@ func (jenkins *Jenkins) get(
return err return err
} }
resp, err := jenkins.sendRequest(req) resp, err := jenkins.sendRequest(req, nil) // GET requests don't need crumb
if err != nil { if err != nil {
return err return err
} }
@@ -223,6 +277,12 @@ func (jenkins *Jenkins) postAndGetLocation(
path string, path string,
params url.Values, params url.Values,
) (int, error) { ) (int, error) {
// Fetch CSRF crumb before POST request
crumb, err := jenkins.getCrumb(ctx)
if err != nil {
return 0, fmt.Errorf("failed to get crumb: %w", err)
}
requestURL := jenkins.buildURL(path, params) requestURL := jenkins.buildURL(path, params)
req, err := http.NewRequestWithContext(ctx, "POST", requestURL, nil) req, err := http.NewRequestWithContext(ctx, "POST", requestURL, nil)
@@ -230,7 +290,7 @@ func (jenkins *Jenkins) postAndGetLocation(
return 0, err return 0, err
} }
resp, err := jenkins.sendRequest(req) resp, err := jenkins.sendRequest(req, crumb)
if err != nil { if err != nil {
return 0, err return 0, err
} }
+3 -1
View File
@@ -751,6 +751,8 @@ func TestNewJenkinsWithCACert(t *testing.T) {
) )
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, jenkins) assert.NotNil(t, jenkins)
assert.Equal(t, http.DefaultClient, jenkins.Client) assert.NotNil(t, jenkins.Client)
// Client should have CookieJar for CSRF session management
assert.NotNil(t, jenkins.Client.Jar)
}) })
} }
+6
View File
@@ -314,7 +314,10 @@ func TestExecTriggerMultipleJobs(t *testing.T) {
// Create a mock Jenkins server // Create a mock Jenkins server
jobsTriggered := 0 jobsTriggered := 0
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// Only count POST requests (job triggers), not GET requests (crumb)
if r.Method == "POST" {
jobsTriggered++ jobsTriggered++
}
w.Header(). w.Header().
Set("Location", fmt.Sprintf("http://jenkins.example.com/queue/item/%d/", jobsTriggered)) Set("Location", fmt.Sprintf("http://jenkins.example.com/queue/item/%d/", jobsTriggered))
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
@@ -390,7 +393,10 @@ func TestExecWithJobsContainingWhitespace(t *testing.T) {
// Create a mock Jenkins server // Create a mock Jenkins server
jobsTriggered := 0 jobsTriggered := 0
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// Only count POST requests (job triggers), not GET requests (crumb)
if r.Method == "POST" {
jobsTriggered++ jobsTriggered++
}
w.Header(). w.Header().
Set("Location", fmt.Sprintf("http://jenkins.example.com/queue/item/%d/", jobsTriggered)) Set("Location", fmt.Sprintf("http://jenkins.example.com/queue/item/%d/", jobsTriggered))
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)