mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-10-30 18:22:49 -04:00 
			
		
		
		
	* ci: Use golangci's github action for linting Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix most of the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the prealloc lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the misspell lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the varcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the errcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the bodyclose lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the deadcode lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the unused lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosec lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosimple lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the ineffassign lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert the misspell change, use a neutral English Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove broken golangci-lint CI job Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Re-add errantly-removed weakrand initialization Signed-off-by: Dave Henderson <dhenderson@gmail.com> * don't break the loop and return * Removing extra handling for null rootKey * unignore RegisterModule/RegisterAdapter Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * single-line log message Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Fix lint after a1808b0dbf209c615e438a496d257ce5e3acdce2 was merged Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert ticker change, ignore it instead Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Ignore some of the write errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove blank line Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Use lifetime Signed-off-by: Dave Henderson <dhenderson@gmail.com> * close immediately Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Preallocate configVals Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Update modules/caddytls/distributedstek/distributedstek.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
		
			
				
	
	
		
			95 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			95 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2015 Matthew Holt and The Caddy Authors
 | |
| //
 | |
| // Licensed 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 caddyhttp
 | |
| 
 | |
| import (
 | |
| 	"crypto/tls"
 | |
| 	"net/http"
 | |
| 
 | |
| 	"go.uber.org/zap/zapcore"
 | |
| )
 | |
| 
 | |
| // LoggableHTTPRequest makes an HTTP request loggable with zap.Object().
 | |
| type LoggableHTTPRequest struct{ *http.Request }
 | |
| 
 | |
| // MarshalLogObject satisfies the zapcore.ObjectMarshaler interface.
 | |
| func (r LoggableHTTPRequest) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 | |
| 	enc.AddString("remote_addr", r.RemoteAddr)
 | |
| 	enc.AddString("proto", r.Proto)
 | |
| 	enc.AddString("method", r.Method)
 | |
| 	enc.AddString("host", r.Host)
 | |
| 	enc.AddString("uri", r.RequestURI)
 | |
| 	enc.AddObject("headers", LoggableHTTPHeader(r.Header))
 | |
| 	if r.TLS != nil {
 | |
| 		enc.AddObject("tls", LoggableTLSConnState(*r.TLS))
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // LoggableHTTPHeader makes an HTTP header loggable with zap.Object().
 | |
| type LoggableHTTPHeader http.Header
 | |
| 
 | |
| // MarshalLogObject satisfies the zapcore.ObjectMarshaler interface.
 | |
| func (h LoggableHTTPHeader) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 | |
| 	if h == nil {
 | |
| 		return nil
 | |
| 	}
 | |
| 	for key, val := range h {
 | |
| 		enc.AddArray(key, LoggableStringArray(val))
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // LoggableStringArray makes a slice of strings marshalable for logging.
 | |
| type LoggableStringArray []string
 | |
| 
 | |
| // MarshalLogArray satisfies the zapcore.ArrayMarshaler interface.
 | |
| func (sa LoggableStringArray) MarshalLogArray(enc zapcore.ArrayEncoder) error {
 | |
| 	if sa == nil {
 | |
| 		return nil
 | |
| 	}
 | |
| 	for _, s := range sa {
 | |
| 		enc.AppendString(s)
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // LoggableTLSConnState makes a TLS connection state loggable with zap.Object().
 | |
| type LoggableTLSConnState tls.ConnectionState
 | |
| 
 | |
| // MarshalLogObject satisfies the zapcore.ObjectMarshaler interface.
 | |
| func (t LoggableTLSConnState) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 | |
| 	enc.AddBool("resumed", t.DidResume)
 | |
| 	enc.AddUint16("version", t.Version)
 | |
| 	enc.AddUint16("cipher_suite", t.CipherSuite)
 | |
| 	enc.AddString("proto", t.NegotiatedProtocol)
 | |
| 	// NegotiatedProtocolIsMutual is deprecated - it's always true
 | |
| 	enc.AddBool("proto_mutual", true)
 | |
| 	enc.AddString("server_name", t.ServerName)
 | |
| 	if len(t.PeerCertificates) > 0 {
 | |
| 		enc.AddString("client_common_name", t.PeerCertificates[0].Subject.CommonName)
 | |
| 		enc.AddString("client_serial", t.PeerCertificates[0].SerialNumber.String())
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // Interface guards
 | |
| var (
 | |
| 	_ zapcore.ObjectMarshaler = (*LoggableHTTPRequest)(nil)
 | |
| 	_ zapcore.ObjectMarshaler = (*LoggableHTTPHeader)(nil)
 | |
| 	_ zapcore.ArrayMarshaler  = (*LoggableStringArray)(nil)
 | |
| 	_ zapcore.ObjectMarshaler = (*LoggableTLSConnState)(nil)
 | |
| )
 |