fishy commented on a change in pull request #2351: URL: https://github.com/apache/thrift/pull/2351#discussion_r594485395
########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ Review comment: I think the license header is supposed to be before `package` declaration? ########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz Review comment: 1. Is there a reason this package name is different from the directory name? I understand that this is not really some library code others would import, but this still seem unnecessary. 2. Is there a reason this is under tutorial instead of, say, `lib/go/test`? ########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import ( + "context" + "fmt" + "shared" + "strconv" + "tutorial" + + "github.com/apache/thrift/lib/go/thrift" +) + +func fuzzChooseProtocol(d byte, t thrift.TTransport) thrift.TProtocol { + switch d { + case 0: + return thrift.NewTCompactProtocolFactory().GetProtocol(t) + } + return thrift.NewTBinaryProtocolFactoryDefault().GetProtocol(t) +} + +func Fuzz(data []byte) int { + if len(data) < 2 { + return 0 + } + inputTransport := thrift.NewTMemoryBuffer() + inputTransport.Buffer.Write(data[2:]) + outputTransport := thrift.NewTMemoryBuffer() + outputProtocol := fuzzChooseProtocol(data[0], outputTransport) + inputProtocol := fuzzChooseProtocol(data[1], inputTransport) + ctx := thrift.SetResponseHelper( + context.Background(), + thrift.TResponseHelper{ + THeaderResponseHelper: thrift.NewTHeaderResponseHelper(outputProtocol), + }, + ) + handler := NewCalculatorHandler() + processor := tutorial.NewCalculatorProcessor(handler) + ok := true + var err error + for ok { + ok, err = processor.Process(ctx, inputProtocol, outputProtocol) + if err != nil { + // Handle parse error + return 0 + } +res := make([]byte, 1024) +n, err := outputTransport.Buffer.Read(res) +fmt.Printf("lol %d %s %v\n", n, err, res) + } + return 1 +} + +type CalculatorHandler struct { + log map[int]*shared.SharedStruct +} + +func NewCalculatorHandler() *CalculatorHandler { + return &CalculatorHandler{log: make(map[int]*shared.SharedStruct)} +} + +func (p *CalculatorHandler) Ping(ctx context.Context) (err error) { + fmt.Print("ping()\n") + return nil +} + +func (p *CalculatorHandler) Add(ctx context.Context, num1 int32, num2 int32) (retval17 int32, err error) { + fmt.Print("add(", num1, ",", num2, ")\n") + return num1 + num2, nil +} + +func (p *CalculatorHandler) Calculate(ctx context.Context, logid int32, w *tutorial.Work) (val int32, err error) { + fmt.Print("calculate(", logid, ", {", w.Op, ",", w.Num1, ",", w.Num2, "})\n") + switch w.Op { + case tutorial.Operation_ADD: + val = w.Num1 + w.Num2 + break + case tutorial.Operation_SUBTRACT: + val = w.Num1 - w.Num2 + break + case tutorial.Operation_MULTIPLY: + val = w.Num1 * w.Num2 + break + case tutorial.Operation_DIVIDE: + if w.Num2 == 0 { + ouch := tutorial.NewInvalidOperation() + ouch.WhatOp = int32(w.Op) + ouch.Why = "Cannot divide by 0" + err = ouch + return + } + val = w.Num1 / w.Num2 + break + default: + ouch := tutorial.NewInvalidOperation() + ouch.WhatOp = int32(w.Op) + ouch.Why = "Unknown operation" + err = ouch + return + } + entry := shared.NewSharedStruct() + entry.Key = logid + entry.Value = strconv.Itoa(int(val)) + k := int(logid) + /* + oldvalue, exists := p.log[k] + if exists { + fmt.Print("Replacing ", oldvalue, " with ", entry, " for key ", k, "\n") + } else { + fmt.Print("Adding ", entry, " for key ", k, "\n") + } + */ Review comment: is this block of commented out code from some copy-paste? ########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import ( + "context" + "fmt" + "shared" + "strconv" + "tutorial" + + "github.com/apache/thrift/lib/go/thrift" +) + +func fuzzChooseProtocol(d byte, t thrift.TTransport) thrift.TProtocol { + switch d { + case 0: Review comment: if this is truly a random byte, instead of just using `byte` to hold 1/0 value, then we would have 255/256 chance of using binary protocol and 1/256 chance of using compact protocol. should this be something like `d % 2 == 0` instead? ########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import ( + "context" + "fmt" + "shared" + "strconv" + "tutorial" + + "github.com/apache/thrift/lib/go/thrift" +) + +func fuzzChooseProtocol(d byte, t thrift.TTransport) thrift.TProtocol { + switch d { + case 0: + return thrift.NewTCompactProtocolFactory().GetProtocol(t) + } + return thrift.NewTBinaryProtocolFactoryDefault().GetProtocol(t) +} + +func Fuzz(data []byte) int { + if len(data) < 2 { + return 0 + } + inputTransport := thrift.NewTMemoryBuffer() + inputTransport.Buffer.Write(data[2:]) + outputTransport := thrift.NewTMemoryBuffer() + outputProtocol := fuzzChooseProtocol(data[0], outputTransport) + inputProtocol := fuzzChooseProtocol(data[1], inputTransport) + ctx := thrift.SetResponseHelper( + context.Background(), + thrift.TResponseHelper{ + THeaderResponseHelper: thrift.NewTHeaderResponseHelper(outputProtocol), + }, + ) + handler := NewCalculatorHandler() + processor := tutorial.NewCalculatorProcessor(handler) + ok := true + var err error + for ok { + ok, err = processor.Process(ctx, inputProtocol, outputProtocol) + if err != nil { + // Handle parse error + return 0 + } +res := make([]byte, 1024) Review comment: wrong indentation. is this code auto generated by some tool? ########## File path: tutorial/go/fuzz/fuzz.go ########## @@ -0,0 +1,144 @@ +package thriftfuzz + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import ( + "context" + "fmt" + "shared" + "strconv" + "tutorial" + + "github.com/apache/thrift/lib/go/thrift" +) + +func fuzzChooseProtocol(d byte, t thrift.TTransport) thrift.TProtocol { + switch d { + case 0: + return thrift.NewTCompactProtocolFactory().GetProtocol(t) + } + return thrift.NewTBinaryProtocolFactoryDefault().GetProtocol(t) Review comment: nit: those factory constructors are deprecated, please use `NewTCompactProtocolFactoryConf(nil)` and `NewTBinaryProtocolFactoryConf(nil)` instead. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
