cthuang
6526211a69
TUN-4421: Named Tunnels will automatically select the protocol to connect to Cloudflare's edge network
2021-05-17 15:57:44 +01:00
Nuno Diegues
ae460b340b
TUN-4342: Fix false positive warning about unused hostname property
2021-05-13 02:05:19 +01:00
Adam Chalmers
4bd17766a9
TUN-4359: Warn about unused keys in 'tunnel ingress validate'
2021-05-13 02:05:19 +01:00
Areg Harutyunyan
4d43a70a38
Setup a Github action for checking the cloudflared build
2021-05-04 14:31:22 +01:00
Areg Harutyunyan
1073f8db40
TUN-2853: rename STDIN-CONTROL env var to STDIN_CONTROL
2021-04-09 16:43:01 +01:00
Nuno Diegues
b25d38dd72
TUN-4177: Running with proxy-dns should not prevent running Named Tunnels
2021-04-05 11:28:05 +01:00
Adam Chalmers
5afa3251dd
TUN-4150: Only show the connector table in 'tunnel info' if there are connectors. Don't show rows with zero connections.
2021-03-30 20:13:00 +00:00
Adam Chalmers
ebf5292bf9
TUN-4146: Unhide and document grace-period
2021-03-29 16:29:18 -05:00
Adam Chalmers
f9062ab473
TUN-4141: Better error messages for tunnel info subcommand.
2021-03-26 14:45:35 -05:00
Igor Postelnik
da4d0b2bae
TUN-4067: Reformat code for consistent import order, grouping, and fix formatting. Added goimports target to the Makefile to make this easier in the future.
2021-03-24 10:53:29 -05:00
Igor Postelnik
50435546c5
TUN-4118: Don't overwrite existing file with tunnel credentials. For ad-hoc tunnels, this means tunnel won't start if there's a file in the way.
2021-03-24 08:26:22 -05:00
Igor Postelnik
9018ee5d5e
TUN-4116: Ingore credentials-file setting in configuration file during tunnel create and delete opeations.
...
This change has two parts:
1. Update to newer version of the urfave/cli fork that correctly sets flag value along the context hierarchy while respecting config file overide behavior of the most specific instance of the flag.
2. Redefine --credentials-file flag so that create and delete subcommand don't use value from the config file.
2021-03-24 08:15:36 -05:00
Nuno Diegues
8250b67a9f
TUN-4111: Warn the user if both properties "tunnel" and "hostname" are used
2021-03-23 20:14:29 +00:00
Nuno Diegues
4a7763e497
TUN-3998: Allow to cleanup the connections of a tunnel limited to a single client
2021-03-23 08:48:54 +00:00
Nuno Diegues
89d0e45d62
TUN-3993: New `cloudflared tunnel info` to obtain details about the active connectors for a tunnel
2021-03-17 14:08:18 +00:00
Igor Postelnik
a34099724e
TUN-4094: Don't read configuration file for access commands
2021-03-16 17:36:46 -05:00
Igor Postelnik
8c5498fad1
TUN-3715: Only read config file once, right before invoking the command
2021-03-16 17:22:13 -05:00
Adam Chalmers
2c746b3361
TUN-4081: Update log severities to use Zerolog's levels
2021-03-16 19:04:49 +00:00
Adam Chalmers
aa5ebb817a
TUN-4075: Dedup test should not compare order of list
2021-03-10 13:48:59 -06:00
Igor Postelnik
39065377b5
TUN-4063: Cleanup dependencies between packages.
...
- Move packages the provide generic functionality (such as config) from `cmd` subtree to top level.
- Remove all dependencies on `cmd` subtree from top level packages.
- Consolidate all code dealing with token generation and transfer to a single cohesive package.
2021-03-09 14:02:59 +00:00
Adam Chalmers
ded9dec4f0
TUN-3819: Remove client-side check that deleted tunnels have no connections
2021-03-05 21:21:10 +00:00
Adam Chalmers
4f88982584
TUN-3994: Log client_id when running a named tunnel
2021-03-03 17:27:23 +00:00
Nuno Diegues
bcd71b56e9
TUN-3989: Check in with Updater service in more situations and convey messages to user
2021-03-03 13:57:04 +00:00
Adam Chalmers
5c7b451e17
TUN-3995: Optional --features flag for tunnel run.
...
These features will be included in the ClientInfo.Features field when
running a named tunnel.
2021-03-02 16:21:17 -06:00
cthuang
b73c039070
TUN-3988: Log why it cannot check if origin cert exists
2021-03-01 21:37:44 +00:00
Nuno Diegues
f1ca2de515
TUN-3978: Unhide teamnet commands and improve their help
2021-03-01 11:59:46 +00:00
Adam Chalmers
27507ab192
TUN-3970: Route ip show has alias route ip list
2021-02-26 17:15:43 +00:00
Nuno Diegues
5ba3b3b309
TUN-3939: Add logging that shows that Warp-routing is enabled
2021-02-23 14:19:47 +00:00
Nuno Diegues
6681d179dc
TUN-3809: Allow routes ip show to output as JSON or YAML
...
It also fixes the marshelling of CIDR into JSON since otherwise
it would show garbled characters as the mask.
2021-02-23 14:19:47 +00:00
cthuang
2146f71b45
TUN-3753: Select http2 protocol when warp routing is enabled
2021-02-23 14:19:47 +00:00
Sudarsan Reddy
b4700a52e3
TUN-3725: Warp-routing is independent of ingress
...
- Changed warp-routing configuration to its own yaml.
- Ingress Rules host matching is indepedent of warp-routing.
2021-02-23 14:19:47 +00:00
cthuang
e2262085e5
TUN-3617: Separate service from client, and implement different client for http vs. tcp origins
...
- extracted ResponseWriter from proxyConnection
- added bastion tests over websocket
- removed HTTPResp()
- added some docstrings
- Renamed some ingress clients as proxies
- renamed instances of client to proxy in connection and origin
- Stream no longer takes a context and logger.Service
2021-02-23 14:19:44 +00:00
Igor Postelnik
a8ae6de213
TUN-3924: Removed db-connect command. Added a placeholder handler for this command that informs users that command is no longer supported.
2021-02-17 20:13:51 -06:00
David Jimenez
d7c4a89106
Add max upstream connections dns-proxy option ( #290 )
...
* Add max upstream connections dns-proxy option
Allows defining a limit to the number of connections that can be
established with the upstream DNS host.
If left unset, there may be situations where connections fail to
establish, which causes the Transport to create an influx of connections
causing upstream to throttle our requests and triggering a runaway
effect resulting in high CPU usage. See https://github.com/cloudflare/cloudflared/issues/91
* Code review with proposed changes
* Add max upstream connections flag to tunnel flags
* Reduce DNS proxy max upstream connections default value
Reduce the default value of maximum upstream connections on the DNS
proxy to guarantee it works on single-core and other low-end hardware.
Further testing could allow for a safe increase of this value.
* Update dns-proxy flag name
Also remove `MaxUpstreamConnsFlag` const as it's no longer referenced in more than one place and to make things more consistent with how the other flags are referenced.
Co-authored-by: Adam Chalmers <achalmers@cloudflare.com>
2021-02-12 21:32:29 +04:00
Adam Chalmers
dbd90f270e
TUN-3864: Users can choose where credentials file is written after creating a tunnel
2021-02-05 11:20:51 -06:00
Adam Chalmers
dca77ee13e
TUN-3854: cloudflared tunnel list flags to sort output
2021-02-03 23:47:49 +00:00
Adam Chalmers
0d22106416
TUN-3848: Use transport logger for h2mux
2021-02-03 17:31:16 -06:00
Igor Postelnik
6cdd20e820
TUN-3792: Handle graceful shutdown correctly when running as a windows service. Only expose one shutdown channel globally, which now triggers the graceful shutdown sequence across all modes. Removed separate handling of zero-duration grace period, instead it's checked only when we need to wait for exit.
2021-01-27 07:21:34 -06:00
Igor Postelnik
d503aeaf77
TUN-3118: Changed graceful shutdown to immediately unregister tunnel from the edge, keep the connection open until the edge drops it or grace period expires
2021-01-22 11:14:36 -06:00
Igor Postelnik
4a76ed12e7
TUN-3766: Print flags defined at all levels of command hierarchy, not just locally defined flags for a command. This fixes output of overriden settings for subcommand.
2021-01-18 11:16:42 +00:00
Igor Postelnik
04b1e4f859
TUN-3738: Refactor observer to avoid potential of blocking on tunnel notifications
2021-01-18 11:16:23 +00:00
Nuno Diegues
7c3ceeeaef
TUN-3757: Fix legacy Uint flags that are incorrectly handled by ufarve library
...
The following UInt flags:
* Uint64 - heartbeat-count, compression-quality
* Uint - retries, port, proxy-port
were not being correctly picked from the configuration YAML
since the multi origin refactor
This is due to a limitation of the ufarve library, which we
overcome for now with handling those as Int flags.
2021-01-14 13:08:55 +00:00
Nuno Diegues
9ed536c990
TUN-3738: Consume UI events even when UI is disabled
...
Not doing so was causing cloudflared to become stuck after
some time. This would happen because the Observer pattern
was sending events to the UI channel (that has 16 slots) but
no one was consuming those when the UI is not enabled (which
is the default case).
Hence, events (such as connection disconnect / reconnect) would
cause that buffer to be full and cause cloudflared to become
apparently stuck, in the sense that the connections would not be
reconnected.
2021-01-13 13:10:30 +00:00
Adam Chalmers
94ca4f98dd
Review from Igor
2021-01-11 19:36:31 +00:00
Adam Chalmers
b601b24f52
Adam's suggestions
2021-01-11 19:36:31 +00:00
TownLake
b40d8557cf
TUN-3691: Edit Teamnet help text
2021-01-11 19:36:31 +00:00
Adam Chalmers
78ffb1b846
TUN-3688: Subcommand for users to check which route an IP proxies through
2021-01-07 15:31:26 +00:00
Areg Harutyunyan
55bf904689
TUN-3471: Add structured log context to logs
2021-01-05 20:21:16 +00:00
Adam Chalmers
b855e33327
TUN-3706: Quit if any origin service fails to start
2020-12-30 13:48:19 -06:00
Adam Chalmers
32336859f8
TUN-3689: Delete routes via cloudflared CLI
2020-12-29 13:53:48 -06:00
Adam Chalmers
94c639d225
TUN-3669: Teamnet commands to add/show Teamnet routes.
2020-12-29 17:39:08 +00:00
Areg Harutyunyan
2ea491b1d0
TUN-3607: Set up single-file logger with zerolog
2020-12-23 14:15:39 -06:00
Areg Harutyunyan
870f5fa907
TUN-3470: Replace in-house logger calls with zerolog
2020-12-23 14:15:17 -06:00
Sudarsan Reddy
1c0dac77d7
TUN-3599: improved delete if credentials isnt found.
...
Tunnel delete is successful even if we don't find the credentials
file in the user's filesystem. We no longer "error" indicating this
is a problem. This fix also enables chaining of the delete command
by removing a pre-mature return if the credentials file is not found.
2020-12-04 11:44:13 +00:00
Adam Chalmers
38fb0b28b6
TUN-3593: /ready endpoint for k8s readiness. Move tunnel events out of UI package, into connection package.
2020-12-02 15:22:59 -06:00
Adam Chalmers
69fd502db3
TUN-3581: Tunnels can be run by name using only --credentials-file, no
...
origin cert necessary.
2020-11-25 09:54:28 -06:00
Michael Borkenstein
fcc393e2f0
AUTH-3221: Saves org token to disk and uses it to refresh the app token
2020-11-24 21:38:59 +00:00
Areg Harutyunyan
cad58b9b57
TUN-3561: Unified logger configuration
2020-11-23 16:49:07 +00:00
Adam Chalmers
a08a7030d1
TUN-3578: cloudflared tunnel route dns should allow wildcard subdomains
2020-11-23 09:37:46 -06:00
Adam Chalmers
029f7e0378
TUN-3555: Single origin service should default to localhost:8080
2020-11-17 23:12:32 +00:00
Adam Chalmers
1475cf61ee
TUN-3534: Specific error message when credentials file is a .pem not .json
2020-11-12 16:38:24 +00:00
cthuang
ebc003d478
TUN-3514: Transport logger write to UI when UI is enabled
2020-11-11 15:21:00 +00:00
cthuang
5974fb4cfd
TUN-3500: Integrate replace h2mux by http2 work with multiple origin support
2020-11-11 15:20:57 +00:00
cthuang
a490443630
TUN-3458: Upgrade to http2 when available, fallback to h2mux when we reach max retries
2020-11-11 15:11:42 +00:00
cthuang
b5cdf3b2c7
TUN-3456: New protocol option auto to automatically select between http2 and h2mux
2020-11-11 15:11:42 +00:00
cthuang
9ac40dcf04
TUN-3462: Refactor cloudflared to separate origin from connection
2020-11-11 15:11:42 +00:00
cthuang
8d7b2575ba
TUN-3400: Use Go HTTP2 library as transport to connect with the edge
2020-11-11 15:11:42 +00:00
cthuang
d7498b0c03
TUN-3449: Use flag to select transport protocol implementation
2020-11-11 15:11:42 +00:00
Adam Chalmers
196762d9d3
TUN-3527: More specific error for invalid YAML/JSON
2020-11-10 21:42:26 +00:00
Adam Chalmers
4698ec8dee
TUN-3461: Show all origin services in the UI
2020-11-10 14:25:37 +00:00
Adam Chalmers
64d3836645
TUN-3522: ingress validate checks that the config file exists
2020-11-09 12:31:50 -06:00
Adam Chalmers
d01770107e
TUN-3492: Refactor OriginService, shrink its interface
2020-11-04 21:28:33 +00:00
Adam Chalmers
e933ef9e1a
TUN-2640: Users can configure per-origin config. Unify single-rule CLI
...
flow with multi-rule config file code.
2020-10-30 07:42:20 -05:00
cthuang
f0cfad8efa
TUN-3476: Fix conversion to string and int slice
2020-10-21 16:03:25 +01:00
Igor Postelnik
ed54d150fe
Move raw ingress rules to config package
2020-10-20 12:00:34 -05:00
Igor Postelnik
ca4887fb19
Split out typed config from legacy command-line switches; refactor ingress commands and fix tests
2020-10-20 10:10:19 -05:00
Igor Postelnik
eaf03305bd
TUN-3475: Unify config file handling with typed config for new fields
2020-10-20 08:55:30 -05:00
Igor Postelnik
051908aaef
TUN-3463: Let users run a named tunnel via config file setting
2020-10-19 12:27:18 +00:00
Adam Chalmers
c96b9e8d8f
TUN-3464: Newtype to wrap []ingress.Rule
2020-10-15 12:48:14 -05:00
Adam Chalmers
4a4a1bb6b1
TUN-3441: Multiple-origin routing via ingress rules
2020-10-13 08:55:17 -05:00
Adam Chalmers
0eebc7cef9
TUN-3438: move ingress into own package, read into TunnelConfig
2020-10-12 16:33:22 +00:00
Igor Postelnik
53a1fa46a8
TUN-3452: Fix loading of flags from config file for tunnel run subcommand. This change also cleans up building of tunnel subcommand list, hides deprecated subcommands and improves help.
2020-10-09 12:07:17 -05:00
Adam Chalmers
86a7af3dc4
TUN-3451: Cloudflared tunnel ingress command
2020-10-08 22:06:40 +00:00
Adam Chalmers
407c9550d7
TUN-3440: 'tunnel rule' command to test ingress rules
2020-10-08 22:06:40 +00:00
Adam Chalmers
2319003e10
TUN-3439: 'tunnel validate' command to check ingress rules
2020-10-08 22:06:40 +00:00
Adam Chalmers
b05d826d22
TUN-3436, TUN-3437: Parse ingress from YAML, ensure last rule catches everything
2020-10-07 16:36:28 +00:00
cthuang
03d7320a44
TUN-3430: Copy flags to configure proxy to run subcommand, print relevant tunnel flags in help
2020-10-01 21:44:27 +00:00
Lee Valentine
8e8513e325
TRAFFIC-448: allow the user to specify the proxy address and port to bind to, falling back to 127.0.0.1 and random port if not specified
2020-09-25 09:54:40 -05:00
cthuang
197d65659a
TUN-3291: cloudflared tunnel run -h explains how to use flags from parent command
2020-09-21 19:07:30 +00:00
Igor Postelnik
85d0afd3b0
TUN-3295: Show route command results
2020-09-21 16:32:08 +00:00
Areg Harutyunyan
747427f816
TUN-3216: UI improvements
2020-09-17 13:22:08 +04:00
Rachel Williams
26fc20d406
TUN-3198: Handle errors while running tunnel UI
2020-09-17 11:52:10 +04:00
Rachel Williams
fee13dc62f
TUN-3255: Update UI to display URL instead of hostname
2020-09-17 11:52:10 +04:00
Rachel Williams
b57a953caa
TUN-3200: Add connection information to UI
2020-09-17 11:52:10 +04:00
Rachel Williams
d8ebde37ca
TUN-3201: Create base cloudflared UI structure
2020-09-17 11:52:07 +04:00
Igor Postelnik
cb6d424765
TUN-3395: Improve help for list command
2020-09-16 16:48:43 +00:00
Igor Postelnik
5753aa9f18
TUN-3294: Perform basic validation on arguments of route command; remove default pool name which wasn't valid
2020-09-16 16:48:43 +00:00
Igor Postelnik
bfae12008d
TUN-3395: Improve help for list command
2020-09-16 08:30:24 -05:00
Igor Postelnik
c52e0dc8ef
TUN-3395: Unhide named tunnel subcommands, tweak help
2020-09-15 12:41:15 +00:00
Adam Chalmers
3be2545ad4
TUN-3292: Mention cleanup in tunnel run help.
2020-09-10 11:02:31 -05:00
cthuang
22d771b51d
TUN-3284: Use cloudflared/<version> as user agent of tunnelstore client
2020-09-09 10:34:26 +01:00
cthuang
5fb938d6d6
TUN-3345: tunnel run accepts name of tunnel as argument
2020-09-05 09:32:50 +00:00
Adam Chalmers
218ee30206
TUN-3377: Tunnel route should check dns/lb before checking tunnel ID
2020-09-04 18:44:06 +00:00
Adam Chalmers
1a96889141
TUN-3286: Use either ID or name in Named Tunnel subcommands.
2020-08-19 14:39:45 +00:00
cthuang
3deef6197f
TUN-3213: Create, route and run named tunnels in one command
2020-08-17 19:38:38 +00:00
Dalton
5499c77e62
AUTH-2975 don't check /etc on windows
2020-08-17 12:40:36 -05:00
cthuang
292a7f07a2
TUN-3243: Refactor tunnel subcommands to allow commands to compose better
2020-08-11 10:02:52 +01:00
Adam Chalmers
1b61d699c4
TUN-3237: By default, don't show connections that are pending reconnect
2020-08-07 10:16:13 -05:00
cthuang
a7562dff68
TUN-3233: List tunnels support filtering by deleted, name, existed at and id
2020-08-07 10:09:26 +01:00
cthuang
1cbc8fb8ac
TUN-3220: tunnel route reports created route
2020-07-31 17:48:58 +01:00
Igor Postelnik
d61e3fb130
TUN-3190: Initialize logger using command line flags in tunnels subcommands
2020-07-21 17:25:48 +00:00
Dalton
ca7d6797e1
AUTH-2902 redirect with just the root host on curl commands
2020-07-21 11:08:31 -05:00
cthuang
8836ee1dda
TUN-3156: Add route subcommand under tunnel
2020-07-17 05:51:24 +08:00
Rachel Williams
3d782f7162
TUN-3048: Handle error when user tries to delete active tunnel
2020-07-14 15:32:46 +00:00
Rachel Williams
f7ff41f1dc
TUN-3150: cloudflared tunnel list's table should use intelligent column width
2020-07-07 15:48:56 +00:00
cthuang
f5c8ff77e9
TUN-3008: Implement cloudflared tunnel cleanup command
2020-07-07 21:56:46 +08:00
cthuang
87e06100df
TUN-3131: Allow user to specify tunnel credentials path, and remove it in tunnel delete command
2020-07-07 14:22:08 +08:00
Igor Postelnik
2a3d486126
TUN-3007: Implement named tunnel connection registration and unregistration.
...
Removed flag for using quick reconnect, this logic is now always enabled.
2020-07-01 04:19:30 +00:00
Adam Chalmers
4d3ebaf984
TUN-3106: Pass NamedTunnel config to StartServer
2020-06-17 23:20:37 +00:00
Adam Chalmers
a1a8645294
TUN-3066: Command line action for tunnel run
2020-06-17 17:25:23 +00:00
Adam Chalmers
b95b289a8c
TUN-3101: Tunnel list command should only show non-deleted, by default
2020-06-16 17:55:33 -05:00
Dalton
425554077f
AUTH-2815 flag check was wrong. stupid oversight
2020-06-16 16:19:38 -05:00
Dalton
6e5ccd7c85
AUTH-2815 add the log file to support the config.yaml file
...
added small delay to handle the possiblity of the server not being started yet
2020-06-16 17:48:12 +00:00
Adam Chalmers
3ec500bdbb
TUN-3084: Generate and store tunnel_secret value during tunnel creation
2020-06-16 11:45:27 -05:00
Dalton
55acf7283c
AUTH-2810 added warn for backwards compatibility sake
2020-06-12 22:15:28 +00:00
Adam Chalmers
acb7d604fd
TUN-3038: Add connections to tunnel list table
2020-06-12 11:43:06 -05:00
Dalton
ae8d784e36
AUTH-2763 don't redirect from curl command
2020-06-11 15:38:11 -05:00
Dalton
c716dd273c
AUTH-2648 updated usage text
2020-06-11 11:08:05 -05:00
Dalton
f8638839c0
AUTH-2729 added log file and level to cmd flags to match config file settings
2020-06-08 19:42:34 +00:00
Dalton
e376a13025
AUTH-2645 protect against user mistaken flag input
2020-06-05 15:10:09 -05:00
cthuang
fb82b2ced5
TUN-3019: Remove declarative tunnel entry code
2020-05-30 05:54:17 +08:00
Dalton
046be63253
AUTH-2596 added new logger package and replaced logrus
2020-05-27 17:07:19 -05:00
Igor Postelnik
a908453aa4
TUN-2928, TUN-2929, TUN-2930: Add tunnel subcommands to interact with tunnel store service
2020-05-21 15:36:49 -05:00
Michael Borkenstein
b89cc22896
AUTH-2369: RDP Bastion prototype
2020-05-19 21:10:50 -05:00
Michael Borkenstein
6a7418e1af
AUTH-2686: Added error handling to tunnel subcommand
2020-05-18 15:36:25 -05:00
Dalton
8c870c19a6
AUTH-2505 added aliases
2020-05-13 15:15:08 -05:00
Igor Postelnik
8cc69f2a95
TUN-2860: Enable quick reconnect feature by default
2020-05-07 14:41:55 -05:00
cthuang
c3fa4552aa
TUN-2872: Exit with non-0 status code when the binary is updated so launchd will restart the service
2020-05-06 05:53:14 +08:00
Igor Postelnik
dd0881f32b
TUN-2940: Added delay parameter to stdin reconnect command.
2020-05-01 15:58:19 +00:00
Austin Cherry
f18209af7d
ARES-899: Fixes DoH client as system resolver. Fixes #91
2020-04-14 12:37:59 -05:00
Dalton
a37da2b165
AUTH-2394 added socks5 proxy
2020-04-07 13:30:28 -05:00
Areg Harutyunyan
ae374c0463
TUN-2846: Trigger debug reconnects from stdin commands, not SIGUSR1
2020-03-27 17:04:21 +00:00
Dalton
a368fbbe9b
AUTH-2394 fixed header for websockets. Added TCP alias
2020-03-23 10:27:53 -05:00
Adam Chalmers
6dcf3a4cbc
TUN-2819: cloudflared should close its connections when a signal is sent
2020-03-19 21:02:15 +00:00
Adam Chalmers
1b2a96f96b
TUN-2755: ReconnectTunnel RPC now transmits ConnectionDigest
2020-03-06 14:48:16 -06:00
Adam Chalmers
6b3e2b020b
TUN-2785: Use reconnect token by default
2020-03-05 16:12:49 +00:00
Roman Iuvshyn
29f4650e25
do not terminate tunnel if origin is not reachable on start-up ( #177 )
2020-02-27 23:03:00 +00:00
Adam Chalmers
a83b6a2155
TUN-2725: Specify in code that --edge is for internal testing only
2020-02-19 16:18:48 -06:00
Adam Chalmers
a60c0273f5
TUN-2714: New edge discovery. Connections try to reconnect to the same edge IP.
2020-02-14 19:49:54 +00:00
Adam Chalmers
dfe61fda88
TUN-2645: Revert "TUN-2645: Turn on reconnect tokens"
...
This reverts commit 053b2c17f1
.
2020-01-27 14:59:07 -06:00