|  | @@ -3,17 +3,36 @@
 | 
											
												
													
														|  |  package http
 |  |  package http
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import (
 |  |  import (
 | 
											
												
													
														|  | 
 |  | +	"crypto/tls"
 | 
											
												
													
														|  |  	"encoding/json"
 |  |  	"encoding/json"
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	v2net "github.com/v2ray/v2ray-core/common/net"
 |  |  	v2net "github.com/v2ray/v2ray-core/common/net"
 | 
											
												
													
														|  |  	"github.com/v2ray/v2ray-core/proxy/internal/config"
 |  |  	"github.com/v2ray/v2ray-core/proxy/internal/config"
 | 
											
												
													
														|  |  )
 |  |  )
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +func (this *CertificateConfig) UnmarshalJSON(data []byte) error {
 | 
											
												
													
														|  | 
 |  | +	type JsonConfig struct {
 | 
											
												
													
														|  | 
 |  | +		Domain   string `json:"domain"`
 | 
											
												
													
														|  | 
 |  | +		CertFile string `json:"cert"`
 | 
											
												
													
														|  | 
 |  | +		KeyFile  string `json:"key"`
 | 
											
												
													
														|  | 
 |  | +	}
 | 
											
												
													
														|  | 
 |  | +	jsonConfig := new(JsonConfig)
 | 
											
												
													
														|  | 
 |  | +	if err := json.Unmarshal(data, jsonConfig); err != nil {
 | 
											
												
													
														|  | 
 |  | +		return err
 | 
											
												
													
														|  | 
 |  | +	}
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +	cert, err := tls.LoadX509KeyPair(jsonConfig.CertFile, jsonConfig.KeyFile)
 | 
											
												
													
														|  | 
 |  | +	if err != nil {
 | 
											
												
													
														|  | 
 |  | +		return err
 | 
											
												
													
														|  | 
 |  | +	}
 | 
											
												
													
														|  | 
 |  | +	this.Domain = jsonConfig.Domain
 | 
											
												
													
														|  | 
 |  | +	this.Certificate = cert
 | 
											
												
													
														|  | 
 |  | +}
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  func (this *TlsConfig) UnmarshalJSON(data []byte) error {
 |  |  func (this *TlsConfig) UnmarshalJSON(data []byte) error {
 | 
											
												
													
														|  |  	type JsonConfig struct {
 |  |  	type JsonConfig struct {
 | 
											
												
													
														|  | -		Enabled  bool
 |  | 
 | 
											
												
													
														|  | -		CertFile string
 |  | 
 | 
											
												
													
														|  | -		KeyFile  string
 |  | 
 | 
											
												
													
														|  | 
 |  | +		Enabled bool                 `json:"enable"`
 | 
											
												
													
														|  | 
 |  | +		Certs   []*CertificateConfig `json:"certs"`
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  	jsonConfig := new(JsonConfig)
 |  |  	jsonConfig := new(JsonConfig)
 | 
											
												
													
														|  |  	if err := json.Unmarshal(data, jsonConfig); err != nil {
 |  |  	if err := json.Unmarshal(data, jsonConfig); err != nil {
 | 
											
										
											
												
													
														|  | @@ -21,8 +40,7 @@ func (this *TlsConfig) UnmarshalJSON(data []byte) error {
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	this.Enabled = jsonConfig.Enabled
 |  |  	this.Enabled = jsonConfig.Enabled
 | 
											
												
													
														|  | -	this.CertFile = jsonConfig.CertFile
 |  | 
 | 
											
												
													
														|  | -	this.KeyFile = jsonConfig.KeyFile
 |  | 
 | 
											
												
													
														|  | 
 |  | +	this.Certs = jsonConfig.Certs
 | 
											
												
													
														|  |  	return nil
 |  |  	return nil
 | 
											
												
													
														|  |  }
 |  |  }
 | 
											
												
													
														|  |  
 |  |  
 |