Initially proposed by #2376 and fixes #3068 as well.tokarchuk/v1.17
Unknwon
8 years ago
parent
326c982660
commit
401bf944ef
@ -0,0 +1,52 @@ |
||||
// Copyright 2016 The Gogs Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package migrations |
||||
|
||||
import ( |
||||
"encoding/json" |
||||
"fmt" |
||||
"strings" |
||||
|
||||
"github.com/Unknwon/com" |
||||
"github.com/go-xorm/xorm" |
||||
) |
||||
|
||||
func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error { |
||||
results, err := x.Query("SELECT `id`,`cfg` FROM `login_source` WHERE `type` = 2 OR `type` = 5") |
||||
if err != nil { |
||||
if strings.Contains(err.Error(), "no such column") { |
||||
return nil |
||||
} |
||||
return fmt.Errorf("select LDAP login sources: %v", err) |
||||
} |
||||
|
||||
sess := x.NewSession() |
||||
defer sessionRelease(sess) |
||||
if err = sess.Begin(); err != nil { |
||||
return err |
||||
} |
||||
|
||||
for _, result := range results { |
||||
cfg := map[string]interface{}{} |
||||
if err = json.Unmarshal(result["cfg"], &cfg); err != nil { |
||||
return fmt.Errorf("decode JSON config: %v", err) |
||||
} |
||||
if com.ToStr(cfg["UseSSL"]) == "true" { |
||||
cfg["SecurityProtocol"] = 1 // LDAPS
|
||||
} |
||||
delete(cfg, "UseSSL") |
||||
|
||||
data, err := json.Marshal(&cfg) |
||||
if err != nil { |
||||
return fmt.Errorf("encode JSON config: %v", err) |
||||
} |
||||
|
||||
if _, err = sess.Exec("UPDATE `login_source` SET `cfg`=? WHERE `id`=?", |
||||
string(data), com.StrTo(result["id"]).MustInt64()); err != nil { |
||||
return fmt.Errorf("update config column: %v", err) |
||||
} |
||||
} |
||||
return sess.Commit() |
||||
} |
||||
File diff suppressed because one or more lines are too long
@ -1 +1 @@ |
||||
0.9.36.0704 |
||||
0.9.37.0708 |
||||
Loading…
Reference in new issue