diff --git a/go/internal/proto/session/session.pb.go b/go/internal/proto/session/session.pb.go index 134aaaece88..d5b0549fe52 100644 --- a/go/internal/proto/session/session.pb.go +++ b/go/internal/proto/session/session.pb.go @@ -934,7 +934,7 @@ var file_deephaven_proto_session_proto_rawDesc = []byte{ 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, - 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xb8, 0x07, 0x0a, 0x0e, 0x53, 0x65, 0x73, 0x73, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xbb, 0x07, 0x0a, 0x0e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7c, 0x0a, 0x0a, 0x4e, 0x65, 0x77, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, @@ -943,7 +943,7 @@ var file_deephaven_proto_session_proto_rawDesc = []byte{ 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x82, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x66, + 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x85, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, @@ -951,54 +951,55 @@ var file_deephaven_proto_session_proto_rawDesc = []byte{ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, - 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a, - 0x0c, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, - 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, - 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, - 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, - 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, - 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, - 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x6c, - 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x69, 0x6f, + 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, + 0x12, 0x7e, 0x0a, 0x0c, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, + 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, + 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, + 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x72, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, - 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x79, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x46, 0x72, 0x6f, 0x6d, 0x54, - 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, - 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, - 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, + 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, + 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, + 0x70, 0x63, 0x2e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x79, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x46, 0x72, + 0x6f, 0x6d, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, + 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, + 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, + 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, + 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, + 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, + 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x8e, 0x01, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, - 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8e, 0x01, 0x0a, - 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, - 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, - 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, - 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, - 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x00, 0x30, 0x01, 0x12, 0xa2, 0x01, - 0x0a, 0x17, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, - 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, - 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, - 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x42, 0x2e, 0x69, + 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, + 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, + 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, + 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x00, 0x30, 0x01, + 0x12, 0xa2, 0x01, 0x0a, 0x17, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, - 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, + 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, + 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, + 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, + 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/go/internal/proto/session/session_grpc.pb.go b/go/internal/proto/session/session_grpc.pb.go index 7ba927d4ff1..87d9038f3b5 100644 --- a/go/internal/proto/session/session_grpc.pb.go +++ b/go/internal/proto/session/session_grpc.pb.go @@ -29,8 +29,12 @@ type SessionServiceClient interface { // // Deprecated: Please use Flight's Handshake or http authorization headers instead. NewSession(ctx context.Context, in *HandshakeRequest, opts ...grpc.CallOption) (*HandshakeResponse, error) + // Deprecated: Do not use. + // // Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated // token that should replace the existing token for subsequent requests. + // + // Deprecated: Please use Flight's Handshake with an empty payload. RefreshSessionToken(ctx context.Context, in *HandshakeRequest, opts ...grpc.CallOption) (*HandshakeResponse, error) // Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all // unreleased exports will be automatically released. @@ -72,6 +76,7 @@ func (c *sessionServiceClient) NewSession(ctx context.Context, in *HandshakeRequ return out, nil } +// Deprecated: Do not use. func (c *sessionServiceClient) RefreshSessionToken(ctx context.Context, in *HandshakeRequest, opts ...grpc.CallOption) (*HandshakeResponse, error) { out := new(HandshakeResponse) err := c.cc.Invoke(ctx, "/io.deephaven.proto.backplane.grpc.SessionService/RefreshSessionToken", in, out, opts...) @@ -160,8 +165,12 @@ type SessionServiceServer interface { // // Deprecated: Please use Flight's Handshake or http authorization headers instead. NewSession(context.Context, *HandshakeRequest) (*HandshakeResponse, error) + // Deprecated: Do not use. + // // Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated // token that should replace the existing token for subsequent requests. + // + // Deprecated: Please use Flight's Handshake with an empty payload. RefreshSessionToken(context.Context, *HandshakeRequest) (*HandshakeResponse, error) // Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all // unreleased exports will be automatically released. diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto index 5a43d7582a9..78b9759613f 100644 --- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto +++ b/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto @@ -40,8 +40,13 @@ service SessionService { /* * Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated * token that should replace the existing token for subsequent requests. + * + * Deprecated: Please use Flight's Handshake with an empty payload. */ - rpc RefreshSessionToken(HandshakeRequest) returns (HandshakeResponse) {} + rpc RefreshSessionToken(HandshakeRequest) returns (HandshakeResponse) { + option deprecated = true; + } + /* * Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all diff --git a/py/client/pydeephaven/proto/session_pb2.py b/py/client/pydeephaven/proto/session_pb2.py index 40a84adc2b8..24ed4c31b30 100644 --- a/py/client/pydeephaven/proto/session_pb2.py +++ b/py/client/pydeephaven/proto/session_pb2.py @@ -15,7 +15,7 @@ from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x65\x65phaven/proto/session.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"I\n\x1cWrappedAuthenticationRequest\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0f\n\x07payload\x18\x05 \x01(\x0cJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"B\n\x10HandshakeRequest\x12\x19\n\rauth_protocol\x18\x01 \x01(\x11\x42\x02\x18\x01\x12\x13\n\x07payload\x18\x02 \x01(\x0c\x42\x02\x18\x01\"\xa2\x01\n\x11HandshakeResponse\x12\x1b\n\x0fmetadata_header\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x19\n\rsession_token\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12(\n\x1atoken_deadline_time_millis\x18\x03 \x01(\x12\x42\x04\x18\x01\x30\x01\x12+\n\x1dtoken_expiration_delay_millis\x18\x04 \x01(\x12\x42\x04\x18\x01\x30\x01\"\x16\n\x14\x43loseSessionResponse\"G\n\x0eReleaseRequest\x12\x35\n\x02id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fReleaseResponse\"\x8b\x01\n\rExportRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x10\n\x0e\x45xportResponse\"\x1b\n\x19\x45xportNotificationRequest\"\xb7\x03\n\x12\x45xportNotification\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12Q\n\x0c\x65xport_state\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.ExportNotification.State\x12\x0f\n\x07\x63ontext\x18\x03 \x01(\t\x12\x18\n\x10\x64\x65pendent_handle\x18\x04 \x01(\t\"\xe7\x01\n\x05State\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PENDING\x10\x01\x12\x0e\n\nPUBLISHING\x10\x02\x12\n\n\x06QUEUED\x10\x03\x12\x0b\n\x07RUNNING\x10\x04\x12\x0c\n\x08\x45XPORTED\x10\x05\x12\x0c\n\x08RELEASED\x10\x06\x12\r\n\tCANCELLED\x10\x07\x12\n\n\x06\x46\x41ILED\x10\x08\x12\x15\n\x11\x44\x45PENDENCY_FAILED\x10\t\x12\x1a\n\x16\x44\x45PENDENCY_NEVER_FOUND\x10\n\x12\x18\n\x14\x44\x45PENDENCY_CANCELLED\x10\x0b\x12\x17\n\x13\x44\x45PENDENCY_RELEASED\x10\x0c\" \n\x1eTerminationNotificationRequest\"\x97\x02\n\x1fTerminationNotificationResponse\x12\x1c\n\x14\x61\x62normal_termination\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\"\n\x1ais_from_uncaught_exception\x18\x03 \x01(\x08\x12\x63\n\x0cstack_traces\x18\x04 \x03(\x0b\x32M.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace\x1a=\n\nStackTrace\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x10\n\x08\x65lements\x18\x03 \x03(\t2\xb8\x07\n\x0eSessionService\x12|\n\nNewSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12\x82\x01\n\x13RefreshSessionToken\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x00\x12~\n\x0c\x43loseSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x37.io.deephaven.proto.backplane.grpc.CloseSessionResponse\"\x00\x12r\n\x07Release\x12\x31.io.deephaven.proto.backplane.grpc.ReleaseRequest\x1a\x32.io.deephaven.proto.backplane.grpc.ReleaseResponse\"\x00\x12y\n\x10\x45xportFromTicket\x12\x30.io.deephaven.proto.backplane.grpc.ExportRequest\x1a\x31.io.deephaven.proto.backplane.grpc.ExportResponse\"\x00\x12\x8e\x01\n\x13\x45xportNotifications\x12<.io.deephaven.proto.backplane.grpc.ExportNotificationRequest\x1a\x35.io.deephaven.proto.backplane.grpc.ExportNotification\"\x00\x30\x01\x12\xa2\x01\n\x17TerminationNotification\x12\x41.io.deephaven.proto.backplane.grpc.TerminationNotificationRequest\x1a\x42.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/sessionb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x65\x65phaven/proto/session.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"I\n\x1cWrappedAuthenticationRequest\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0f\n\x07payload\x18\x05 \x01(\x0cJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"B\n\x10HandshakeRequest\x12\x19\n\rauth_protocol\x18\x01 \x01(\x11\x42\x02\x18\x01\x12\x13\n\x07payload\x18\x02 \x01(\x0c\x42\x02\x18\x01\"\xa2\x01\n\x11HandshakeResponse\x12\x1b\n\x0fmetadata_header\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x19\n\rsession_token\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12(\n\x1atoken_deadline_time_millis\x18\x03 \x01(\x12\x42\x04\x18\x01\x30\x01\x12+\n\x1dtoken_expiration_delay_millis\x18\x04 \x01(\x12\x42\x04\x18\x01\x30\x01\"\x16\n\x14\x43loseSessionResponse\"G\n\x0eReleaseRequest\x12\x35\n\x02id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fReleaseResponse\"\x8b\x01\n\rExportRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x10\n\x0e\x45xportResponse\"\x1b\n\x19\x45xportNotificationRequest\"\xb7\x03\n\x12\x45xportNotification\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12Q\n\x0c\x65xport_state\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.ExportNotification.State\x12\x0f\n\x07\x63ontext\x18\x03 \x01(\t\x12\x18\n\x10\x64\x65pendent_handle\x18\x04 \x01(\t\"\xe7\x01\n\x05State\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PENDING\x10\x01\x12\x0e\n\nPUBLISHING\x10\x02\x12\n\n\x06QUEUED\x10\x03\x12\x0b\n\x07RUNNING\x10\x04\x12\x0c\n\x08\x45XPORTED\x10\x05\x12\x0c\n\x08RELEASED\x10\x06\x12\r\n\tCANCELLED\x10\x07\x12\n\n\x06\x46\x41ILED\x10\x08\x12\x15\n\x11\x44\x45PENDENCY_FAILED\x10\t\x12\x1a\n\x16\x44\x45PENDENCY_NEVER_FOUND\x10\n\x12\x18\n\x14\x44\x45PENDENCY_CANCELLED\x10\x0b\x12\x17\n\x13\x44\x45PENDENCY_RELEASED\x10\x0c\" \n\x1eTerminationNotificationRequest\"\x97\x02\n\x1fTerminationNotificationResponse\x12\x1c\n\x14\x61\x62normal_termination\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\"\n\x1ais_from_uncaught_exception\x18\x03 \x01(\x08\x12\x63\n\x0cstack_traces\x18\x04 \x03(\x0b\x32M.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace\x1a=\n\nStackTrace\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x10\n\x08\x65lements\x18\x03 \x03(\t2\xbb\x07\n\x0eSessionService\x12|\n\nNewSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12\x85\x01\n\x13RefreshSessionToken\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12~\n\x0c\x43loseSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x37.io.deephaven.proto.backplane.grpc.CloseSessionResponse\"\x00\x12r\n\x07Release\x12\x31.io.deephaven.proto.backplane.grpc.ReleaseRequest\x1a\x32.io.deephaven.proto.backplane.grpc.ReleaseResponse\"\x00\x12y\n\x10\x45xportFromTicket\x12\x30.io.deephaven.proto.backplane.grpc.ExportRequest\x1a\x31.io.deephaven.proto.backplane.grpc.ExportResponse\"\x00\x12\x8e\x01\n\x13\x45xportNotifications\x12<.io.deephaven.proto.backplane.grpc.ExportNotificationRequest\x1a\x35.io.deephaven.proto.backplane.grpc.ExportNotification\"\x00\x30\x01\x12\xa2\x01\n\x17TerminationNotification\x12\x41.io.deephaven.proto.backplane.grpc.TerminationNotificationRequest\x1a\x42.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/sessionb\x06proto3') @@ -144,6 +144,8 @@ _HANDSHAKERESPONSE.fields_by_name['token_expiration_delay_millis']._serialized_options = b'\030\0010\001' _SESSIONSERVICE.methods_by_name['NewSession']._options = None _SESSIONSERVICE.methods_by_name['NewSession']._serialized_options = b'\210\002\001' + _SESSIONSERVICE.methods_by_name['RefreshSessionToken']._options = None + _SESSIONSERVICE.methods_by_name['RefreshSessionToken']._serialized_options = b'\210\002\001' _WRAPPEDAUTHENTICATIONREQUEST._serialized_start=98 _WRAPPEDAUTHENTICATIONREQUEST._serialized_end=171 _HANDSHAKEREQUEST._serialized_start=173 @@ -173,5 +175,5 @@ _TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE._serialized_start=1406 _TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE._serialized_end=1467 _SESSIONSERVICE._serialized_start=1470 - _SESSIONSERVICE._serialized_end=2422 + _SESSIONSERVICE._serialized_end=2425 # @@protoc_insertion_point(module_scope) diff --git a/py/client/pydeephaven/proto/session_pb2_grpc.py b/py/client/pydeephaven/proto/session_pb2_grpc.py index 2c12d9730ee..929823e9cd7 100644 --- a/py/client/pydeephaven/proto/session_pb2_grpc.py +++ b/py/client/pydeephaven/proto/session_pb2_grpc.py @@ -97,6 +97,8 @@ def RefreshSessionToken(self, request, context): """ Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated token that should replace the existing token for subsequent requests. + + Deprecated: Please use Flight's Handshake with an empty payload. """ context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') diff --git a/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java index 4b34e621c01..08d1ba312a8 100644 --- a/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java +++ b/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java @@ -46,7 +46,6 @@ public class FlightServiceGrpcImpl extends FlightServiceGrpc.FlightServiceImplBa private final Map authRequestHandlers; - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") @Inject public FlightServiceGrpcImpl( @Nullable final ScheduledExecutorService executorService, @@ -119,7 +118,8 @@ public void onNext(final Flight.HandshakeRequest value) { respondWithAuthTokenBin(session); } - private Optional login(String type, long version, ByteString payload, AuthenticationRequestHandler.HandshakeResponseListener listener) throws AuthenticationException { + private Optional login(String type, long version, ByteString payload, + AuthenticationRequestHandler.HandshakeResponseListener listener) throws AuthenticationException { AuthenticationRequestHandler handler = authRequestHandlers.get(type); if (handler == null) { return Optional.empty(); diff --git a/server/src/main/java/io/deephaven/server/auth/AuthContextModule.java b/server/src/main/java/io/deephaven/server/auth/AuthContextModule.java index bf03ef74c85..f477fddc2a7 100644 --- a/server/src/main/java/io/deephaven/server/auth/AuthContextModule.java +++ b/server/src/main/java/io/deephaven/server/auth/AuthContextModule.java @@ -46,8 +46,10 @@ private static void initializeAuthHandlers() { final AuthenticationRequestHandler authHandler = (AuthenticationRequestHandler) instance; AuthenticationRequestHandler existing = authHandlerMap.put(authHandler.getAuthType(), authHandler); if (existing != null) { - log.error().append("Multiple handlers registered for authentication type ").append(existing.getAuthType()).end(); - throw new UncheckedDeephavenException("Multiple authentication handlers registered for type " + existing.getAuthType()); + log.error().append("Multiple handlers registered for authentication type ") + .append(existing.getAuthType()).end(); + throw new UncheckedDeephavenException( + "Multiple authentication handlers registered for type " + existing.getAuthType()); } } else { log.error().append("Provided auth handler does not implement an auth interface: ") diff --git a/server/src/main/java/io/deephaven/server/session/SessionService.java b/server/src/main/java/io/deephaven/server/session/SessionService.java index 137e12d019f..0af292120b0 100644 --- a/server/src/main/java/io/deephaven/server/session/SessionService.java +++ b/server/src/main/java/io/deephaven/server/session/SessionService.java @@ -7,7 +7,6 @@ import com.google.protobuf.ByteString; import io.deephaven.auth.AuthenticationException; import io.deephaven.auth.AuthenticationRequestHandler; -import io.deephaven.auth.BasicAuthMarshaller; import io.deephaven.configuration.Configuration; import io.deephaven.extensions.barrage.util.GrpcUtil; import io.deephaven.proto.backplane.grpc.TerminationNotificationResponse; @@ -31,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; @@ -65,8 +63,7 @@ public class SessionService { private final Map authRequestHandlers; - @Inject() - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") + @Inject public SessionService(final Scheduler scheduler, final SessionState.Factory sessionFactory, @Named("session.tokenExpireMs") final long tokenExpireMs, Map authRequestHandlers) { diff --git a/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java index f618da4f8b8..4949cd473f4 100644 --- a/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java +++ b/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java @@ -5,6 +5,7 @@ import com.google.protobuf.ByteString; import com.google.rpc.Code; +import io.deephaven.auth.AuthContext; import io.deephaven.auth.AuthenticationException; import io.deephaven.extensions.barrage.util.GrpcUtil; import io.deephaven.internal.log.LoggerFactory; @@ -37,7 +38,6 @@ import javax.inject.Inject; import javax.inject.Singleton; -import java.nio.charset.StandardCharsets; import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; @@ -65,14 +65,10 @@ public SessionServiceGrpcImpl(final SessionService service, final TicketRouter t @Override public void newSession(final HandshakeRequest request, final StreamObserver responseObserver) { GrpcUtil.rpcWrapper(log, responseObserver, () -> { - // TODO: once client APIs are updated to use flight auth, then newSession can be deprecated or removed - final SessionState session; - try { - session = service.getSessionForAuthToken(request.getPayload().toString(StandardCharsets.US_ASCII)); - } catch (AuthenticationException e) { - throw GrpcUtil.statusRuntimeException(Code.UNAUTHENTICATED, "Authentication error"); - } + // TODO: once jsapi is updated to use flight auth, then newSession can be deprecated or removed + final AuthContext authContext = new AuthContext.SuperUser(); + final SessionState session = service.newSession(authContext); responseObserver.onNext(HandshakeResponse.newBuilder() .setMetadataHeader(ByteString.copyFromUtf8(DEEPHAVEN_SESSION_ID)) .setSessionToken(session.getExpiration().getBearerTokenAsByteString()) diff --git a/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java b/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java index ecd8a8072a4..6d1caa5a716 100644 --- a/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java +++ b/server/src/test/java/io/deephaven/server/appmode/ApplicationServiceGrpcImplTest.java @@ -44,7 +44,7 @@ public void setup() { scheduler = new TestControlledScheduler(); sessionService = new SessionService(scheduler, authContext -> new SessionState(scheduler, ExecutionContext::createForUnitTests, authContext), - TOKEN_EXPIRE_MS, Optional.empty(), Collections.emptyMap()); + TOKEN_EXPIRE_MS, Collections.emptyMap()); applicationServiceGrpcImpl = new ApplicationServiceGrpcImpl(scheduler, sessionService, new TypeLookup(ObjectTypeLookup.NoOp.INSTANCE)); } diff --git a/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java b/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java index 8253f5527d6..4b7e067a380 100644 --- a/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java +++ b/server/src/test/java/io/deephaven/server/session/SessionServiceTest.java @@ -32,7 +32,7 @@ public void setup() { scheduler = new TestControlledScheduler(); sessionService = new SessionService(scheduler, authContext -> new SessionState(scheduler, ExecutionContext::createForUnitTests, authContext), - TOKEN_EXPIRE_MS, Optional.empty(), Collections.emptyMap()); + TOKEN_EXPIRE_MS, Collections.emptyMap()); } @After diff --git a/server/test/src/main/java/io/deephaven/server/test/AuthTestModule.java b/server/test/src/main/java/io/deephaven/server/test/AuthTestModule.java index 7126f279ff4..2a5f80116c5 100644 --- a/server/test/src/main/java/io/deephaven/server/test/AuthTestModule.java +++ b/server/test/src/main/java/io/deephaven/server/test/AuthTestModule.java @@ -16,7 +16,7 @@ import java.util.Objects; import java.util.Optional; -@Module() +@Module public class AuthTestModule { public static class BasicAuthTestImpl implements BasicAuthMarshaller.Handler { public Map validLogins = new HashMap<>(); @@ -45,14 +45,10 @@ public BasicAuthMarshaller bindBasicAuth(BasicAuthTestImpl handler) { @Provides @Singleton - public Optional bindBasicAuthProvider(BasicAuthMarshaller marshaller) { - return Optional.of(marshaller); - } - - @Provides - @Singleton - public Map bindAuthHandlerMap() { + public Map bindAuthHandlerMap(BasicAuthMarshaller basicAuthMarshaller) { // note this is mutable - return new HashMap<>(); + HashMap map = new HashMap<>(); + map.put(basicAuthMarshaller.getAuthType(), basicAuthMarshaller); + return map; } }