Skip to content

Commit

Permalink
Merge pull request #587 from bfenetworks/release/v0.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
iyangsj committed Jul 24, 2020
2 parents dd53bad + 539b0a3 commit 701edf1
Show file tree
Hide file tree
Showing 678 changed files with 8,576 additions and 2,410 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Go
on: [push]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v2
with:
stable: 'true'
go-version: 1.13
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2

- name: Lint
run: |
echo "golang lint, suggest to use golangci-lint"
- name: Build
run: |
echo "start to build and test bfe"
go version
make
echo "finish"
- name: coverage
run: |
make coverage
bash <(curl -s https://codecov.io/bash)
8 changes: 6 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@ project_name: bfe
builds:
- binary: bfe
main: ./bfe.go
ldflags:
- -X main.version={{.Version}}
goos:
- linux
- darwin
- windows
goarch:
- amd64
- arm64
ignore:
- goos: windows
goarch: arm64
- goos: darwin
goarch: arm64

changelog:
skip: true
Expand Down
49 changes: 39 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,34 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [v0.11.0] - 2020-07-24

### Added
- Add mod_cors to enable cross-origin resource sharing
- Add mod_secure_link to check authenticity and limit lifetime of links
- Support PROXY protocol for TCP connections to backend
- Support checking revocation status of the client certificate
- mod_auth_request: send request with X-Forwarded-Method/X-Forwarded-Uri headers
- mod_userid: support global rules
- mod_key_log: support conditional logging
- Add arm64 support for goreleaser

### Changed
- Create listeners in the final initialization step
- Change package name to 'github.com/bfenetworks/bfe'

### Removed
- Drops words like blacklist from programming to make vocabulary more inclusive
- Remove legacy signature of response

### Fixed
- Fix getTransport() and modify transports map with write lock

### Security
- Fix textproto: not normalize headers with spaces before the colon (CVE-2019-16276)


## [v0.10.0] - 2020-05-25
### Added
- mod_auth_request: authorize clients based on thirdparty authorization service
Expand Down Expand Up @@ -163,13 +191,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Flexible plugin framework to extend functionality. Based on the framework, developer can add new features rapidly
- Detailed built-in metrics available for service status monitor

[v0.10.0]: https://github.com/baidu/bfe/compare/v0.9.0...v0.10.0
[v0.9.0]: https://github.com/baidu/bfe/compare/v0.8.0...v0.9.0
[v0.8.0]: https://github.com/baidu/bfe/compare/v0.7.0...v0.8.0
[v0.7.0]: https://github.com/baidu/bfe/compare/v0.6.0...v0.7.0
[v0.6.0]: https://github.com/baidu/bfe/compare/v0.5.0...v0.6.0
[v0.5.0]: https://github.com/baidu/bfe/compare/v0.4.0...v0.5.0
[v0.4.0]: https://github.com/baidu/bfe/compare/v0.3.0...v0.4.0
[v0.3.0]: https://github.com/baidu/bfe/compare/v0.2.0...v0.3.0
[v0.2.0]: https://github.com/baidu/bfe/compare/v0.1.0...v0.2.0
[v0.1.0]: https://github.com/baidu/bfe/releases/tag/v0.1.0
[v0.11.0]: https://github.com/bfenetworks/bfe/compare/v0.10.0...v0.11.0
[v0.10.0]: https://github.com/bfenetworks/bfe/compare/v0.9.0...v0.10.0
[v0.9.0]: https://github.com/bfenetworks/bfe/compare/v0.8.0...v0.9.0
[v0.8.0]: https://github.com/bfenetworks/bfe/compare/v0.7.0...v0.8.0
[v0.7.0]: https://github.com/bfenetworks/bfe/compare/v0.6.0...v0.7.0
[v0.6.0]: https://github.com/bfenetworks/bfe/compare/v0.5.0...v0.6.0
[v0.5.0]: https://github.com/bfenetworks/bfe/compare/v0.4.0...v0.5.0
[v0.4.0]: https://github.com/bfenetworks/bfe/compare/v0.3.0...v0.4.0
[v0.3.0]: https://github.com/bfenetworks/bfe/compare/v0.2.0...v0.3.0
[v0.2.0]: https://github.com/bfenetworks/bfe/compare/v0.1.0...v0.2.0
[v0.1.0]: https://github.com/bfenetworks/bfe/releases/tag/v0.1.0
77 changes: 2 additions & 75 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,76 +1,3 @@
# Contributor Covenant Code of Conduct
# BFE Community Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at bfe-osc@baidu.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
BFE follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contribute Code

You are welcome to contribute to project BFE. To contribute to BFE, you have to agree with the
[Contributor License Agreement](https://cla-assistant.io/baidu/bfe).
[Contributor License Agreement](https://cla-assistant.io/bfenetworks/bfe).

We sincerely appreciate your contribution. This document explains our workflow and work style.

Expand Down Expand Up @@ -62,7 +62,7 @@ BFE uses this [Git branching model](http://nvie.com/posts/a-successful-git-branc
An experienced Git user pulls from the official repo often -- daily or even hourly, so they notice conflicts with others work early, and it's easier to resolve smaller conflicts.

```bash
git remote add upstream https://github.com/baidu/bfe
git remote add upstream https://github.com/bfenetworks/bfe
git pull upstream develop
```

Expand All @@ -74,7 +74,7 @@ BFE uses this [Git branching model](http://nvie.com/posts/a-successful-git-branc
git push origin my-cool-stuff
```

The push allows you to create a pull request, requesting owners of this [official repo](https://github.com/baidu/bfe) to pull your change into the official one.
The push allows you to create a pull request, requesting owners of this [official repo](https://github.com/bfenetworks/bfe) to pull your change into the official one.

To create a pull request, please follow [these steps](https://help.github.com/articles/creating-a-pull-request/).

Expand Down
16 changes: 16 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@

| Name | Github Account |
| ---- | -------------- |
| Aifang Xu | flyanna |
| Caiyuan Yang | jansci621 |
| Chao Wang | Corey-Wang |
| Chengjin Wu | ChengjinWu |
| Chongmiao Liu | lcmmhcc |
| Daniel Sutton | ducksecops |
| Dechuang Gu | hellogdc |
| Derek Zheng | shanhuhai5739 |
| Di Zhao | zd0106 |
| Hao Dong | anotherwriter |
| Haobin zhang | zhanghaobin |
| Jie Liu | freeHackOfJeff |
| Jie Wan | wanjiecs |
Expand All @@ -14,19 +21,24 @@
| Kaiyu Zheng | kaiyuzheng |
| Lihua Chen | clh651188968 |
| Limei Xiao | limeix |
| Lei Zhang | deancn |
| Lu Guo | guolu60 |
| Lujie Zheng | ilujiez |
| Mian Wang | iwangmian |
| Miao Zhang | mileszhang2016 |
| Min Dai | daimg |
| Ming Lin | zhugelianglongming |
| MingKun Su | 45736735 |
| Pengwei Tian | Tovi163 |
| Qing Liu | liuximu |
| Qingxin Yang | yangqingxin1993 |
| Quan Zhang | FriendshipBridge |
| Shan Xiao | arlingtonroad |
| Shengnan Yu | goldfish-fish |
| Shuai Yan | yanshuai615270 |
| Sijie Yang | iyangsj |
| Tianqi Zhang | NKztq |
| Weiqiang Zheng | wrayzheng |
| Wenjie Tian | WJTian |
| Wenlong Chen | LeroChen |
| Wensi Yang | tianxinheihei |
Expand All @@ -36,12 +48,16 @@
| Xiaoye Jiang | kidleaf-jiang |
| Xin Li | lx-or-xxxl |
| Yang Liu | dut-yangliu |
| Yusheng Sun | wodedipanr |
| Yuan Liu | lewisay |
| Yuqi Xiao | YuqiXiao |
| Zheng Liu | liuzheng |
| Zhichao Lin | lxiaozhic |
| Yuchen Wang | CHneger |
| Zhankang Han | leceshide |
| | 0xflotus |
| | calify |
| | MoonShining |
| | odidev |
| | u5surf |
| | xiaocongwjb |
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.4-alpine AS build
FROM golang:1.13.11-alpine AS build

WORKDIR /bfe
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Principles

The BFE community adheres to the following principles:
- Open: BFE is open source. See [Contributor License Agreement](https://cla-assistant.io/baidu/bfe).
- Open: BFE is open source. See [Contributor License Agreement](https://cla-assistant.io/bfenetworks/bfe).
- Welcoming and respectful: See [Code of Conduct](CODE_OF_CONDUCT.md).
- Transparent and accessible: Work and collaboration are done in public.
- Merit: Ideas and contributions are accepted according to their technical merit and alignment with project objectives, scope, and design principles.
Expand All @@ -29,7 +29,7 @@ The BFE community adheres to the following principles:

* Classify GitHub issues and perform pull request reviews for other maintainers and the community.

* During GitHub issue classification, apply all applicable [labels](https://github.com/baidu/bfe/labels)
* During GitHub issue classification, apply all applicable [labels](https://github.com/bfenetworks/bfe/labels)
to each new issue. Labels are extremely useful for follow-up of future issues. Which labels to apply
is somewhat subjective so just use your best judgment.

Expand Down
21 changes: 13 additions & 8 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@
This file lists who are the maintainers of the BFE project. The responsibilities for maintainers are listed in the [GOVERNANCE.md](GOVERNANCE.md) file.

## Project Leader
* [Miao Zhang](mailto:zhangmiao02@baidu.com)
* [Sijie Yang](mailto:yangsijie@baidu.com)
| Name | GitHub ID | Affiliation |
| ---- | --------- | ----------- |
| [Miao Zhang](mailto:zhangmiao02@baidu.com) | [mileszhang2016](https://github.com/mileszhang2016) | Baidu |
| [Sijie Yang](mailto:yangsijie@baidu.com) | [iyangsj](https://github.com/iyangsj) | Baidu |

## Senior Maintainers
* [Sijie Yang](mailto:yangsijie@baidu.com)
| Name | GitHub ID | Affiliation |
| ---- | --------- | ----------- |
| [Sijie Yang](mailto:yangsijie@baidu.com) | [iyangsj](https://github.com/iyangsj) | Baidu |

## Maintainers
* [Derek Zheng](mailto:shanhu5739@gmail.com)
* [Xiaofei Yu](mailto:nemo_00o@hotmail.com)
* [Wensi Yang](mailto:tianxinheihei@gmail.com)
* [Kaiyu Zheng](mailto:412674752@qq.com)

| Name | GitHub ID | Affiliation |
| ---- | --------- | ----------- |
| [Derek Zheng](mailto:shanhu5739@gmail.com) | [shanhuhai5739](https://github.com/shanhuhai5739) | Kuaishou |
| [Xiaofei Yu](mailto:nemo_00o@hotmail.com) | [xiaofei0800](https://github.com/xiaofei0800) | Baidu |
| [Wensi Yang](mailto:tianxinheihei@gmail.com) | [tianxinheihei](https://github.com/tianxinheihei) | Baidu |
| [Kaiyu Zheng](mailto:412674752@qq.com) | [kaiyuzheng](https://github.com/kaiyuzheng) | ByteDance |
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019 Baidu, Inc.
# Copyright (c) 2019 The BFE Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019 Baidu, Inc. All Rights Reserved.
Copyright (c) 2019 The BFE Authors. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# BFE

[![GitHub](https://img.shields.io/github/license/baidu/bfe)](https://github.com/baidu/bfe/blob/develop/LICENSE)
[![Travis (.com)](https://img.shields.io/travis/com/baidu/bfe)](https://travis-ci.com/baidu/bfe)
[![Go Report Card](https://goreportcard.com/badge/github.com/baidu/bfe)](https://goreportcard.com/report/github.com/baidu/bfe)
[![GoDoc](https://godoc.org/github.com/baidu/bfe?status.svg)](https://godoc.org/github.com/baidu/bfe/bfe_module)
[![Snap Status](https://build.snapcraft.io/badge/baidu/bfe.svg)](https://build.snapcraft.io/user/baidu/bfe)
[![GitHub](https://img.shields.io/github/license/bfenetworks/bfe)](https://github.com/bfenetworks/bfe/blob/develop/LICENSE)
[![Travis](https://img.shields.io/travis/com/bfenetworks/bfe)](https://travis-ci.com/bfenetworks/bfe)
[![Go Report Card](https://goreportcard.com/badge/github.com/bfenetworks/bfe)](https://goreportcard.com/report/github.com/bfenetworks/bfe)
[![GoDoc](https://godoc.org/github.com/bfenetworks/bfe?status.svg)](https://godoc.org/github.com/bfenetworks/bfe/bfe_module)
[![Snap Status](https://build.snapcraft.io/badge/bfenetworks/bfe.svg)](https://build.snapcraft.io/user/bfenetworks/bfe)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3209/badge)](https://bestpractices.coreinfrastructure.org/projects/3209)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbaidu%2Fbfe.svg?type=shield)](https://app.fossa.io/reports/1bd1bae4-31bf-41bf-8865-320eedbd1f85)
[![CLA assistant](https://cla-assistant.io/readme/badge/baidu/bfe)](https://cla-assistant.io/baidu/bfe)
[![Slack Widget](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=green)](https://bfe-networks.slack.com/messages/bfedev)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbfenetworks%2Fbfe.svg?type=shield)](https://app.fossa.com/reports/1f05f9f0-ac3d-486e-8ba9-ad95dabd4768)
[![CLA assistant](https://cla-assistant.io/readme/badge/bfenetworks/bfe)](https://cla-assistant.io/bfenetworks/bfe)
[![Slack Widget](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=green)](https://slack.cncf.io)

BFE is an open-source layer 7 load balancer derived from proprietary Baidu FrontEnd.
BFE is a modern layer 7 load balancer from baidu.

## Advantages
- Multiple protocols supported, including HTTP, HTTPS, SPDY, HTTP2, WebSocket, TLS, etc.
Expand All @@ -30,18 +30,18 @@ BFE is an open-source layer 7 load balancer derived from proprietary Baidu Front
- [Chinese version](https://www.bfe-networks.net/zh_cn/ABOUT/)

## Contributing
- Please create an issue in [issue list](http://github.com/baidu/bfe/issues).
- Please create an issue in [issue list](http://github.com/bfenetworks/bfe/issues).
- Contact Committers/Owners for further discussion if needed.
- Following the golang coding standards.
- See the [CONTRIBUTING](CONTRIBUTING.md) file for details
- See the [CONTRIBUTING](CONTRIBUTING.md) file for details.

## Authors
- Owners: [MAINTAINERS](MAINTAINERS.md)
- Contributors: [CONTRIBUTORS](CONTRIBUTORS.md)

## Communication
- BFE community on Slack: [Sign up](https://join.slack.com/t/bfe-networks/shared_invite/zt-cn04xsqr-j7LDFmPkCuCZ39OLcHlMBA) and join channels on topics that interest you.
- BFE developer group on WeChat: [Send a request mail](mailto:bfe-osc@baidu.com) with your WeChat ID and a contribution you've made to BFE(such as a PR/Issue). We will invite you right away.
- BFE developer group on WeChat: [Send a request mail](mailto:yangsijie@baidu.com) with your WeChat ID and a contribution you've made to BFE(such as a PR/Issue). We will invite you right away.

## License
BFE is under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.0
0.11.0

0 comments on commit 701edf1

Please sign in to comment.